diff --git a/smp-angular/src/main/resources/META-INF/web-fragment.xml b/smp-angular/src/main/resources/META-INF/web-fragment.xml
index 4e5ce43d28c0aef3a4b1adc9987a5ee3231ba487..59886f49f4a1a7bf2346fc2465efbb93122c6ac7 100644
--- a/smp-angular/src/main/resources/META-INF/web-fragment.xml
+++ b/smp-angular/src/main/resources/META-INF/web-fragment.xml
@@ -2,7 +2,7 @@
#START_LICENSE#
SMP Angular UI
%%
- Copyright (C) 2017 - 2023 European Commission | eDelivery | DomiSMP
+ Copyright (C) 2017 - 2024 European Commission | eDelivery | DomiSMP
%%
Licensed under the EUPL, Version 1.2 or – as soon they will be approved by the European Commission - subsequent
versions of the EUPL (the "Licence");
diff --git a/smp-examples/resource-spi-example/src/main/java/eu/europa/ec/smp/spi/examples/DomiSMPResourceExampleExtension.java b/smp-examples/resource-spi-example/src/main/java/eu/europa/ec/smp/spi/examples/DomiSMPResourceExampleExtension.java
index 6906cb1e50010bd2952984e7ef785da4a910d3a8..d7316f6532e71c5a55575ef2ffc1a3d1c04d61eb 100644
--- a/smp-examples/resource-spi-example/src/main/java/eu/europa/ec/smp/spi/examples/DomiSMPResourceExampleExtension.java
+++ b/smp-examples/resource-spi-example/src/main/java/eu/europa/ec/smp/spi/examples/DomiSMPResourceExampleExtension.java
@@ -2,7 +2,7 @@
* #START_LICENSE#
* resource-spi-example
* %%
- * Copyright (C) 2017 - 2023 European Commission | eDelivery | DomiSMP
+ * Copyright (C) 2017 - 2024 European Commission | eDelivery | DomiSMP
* %%
* Licensed under the EUPL, Version 1.2 or – as soon they will be approved by the European Commission - subsequent
* versions of the EUPL (the "Licence");
diff --git a/smp-examples/resource-spi-example/src/main/java/eu/europa/ec/smp/spi/examples/def/DomiSMPJsonResourceExample.java b/smp-examples/resource-spi-example/src/main/java/eu/europa/ec/smp/spi/examples/def/DomiSMPJsonResourceExample.java
index b173175ff7ae39185806fc44d8628d72557f36f9..47a1b389dc3283d47a0cbdf2656f15f3a8328864 100644
--- a/smp-examples/resource-spi-example/src/main/java/eu/europa/ec/smp/spi/examples/def/DomiSMPJsonResourceExample.java
+++ b/smp-examples/resource-spi-example/src/main/java/eu/europa/ec/smp/spi/examples/def/DomiSMPJsonResourceExample.java
@@ -2,7 +2,7 @@
* #START_LICENSE#
* resource-spi-example
* %%
- * Copyright (C) 2017 - 2023 European Commission | eDelivery | DomiSMP
+ * Copyright (C) 2017 - 2024 European Commission | eDelivery | DomiSMP
* %%
* Licensed under the EUPL, Version 1.2 or – as soon they will be approved by the European Commission - subsequent
* versions of the EUPL (the "Licence");
diff --git a/smp-examples/resource-spi-example/src/main/java/eu/europa/ec/smp/spi/examples/def/DomiSMPPropertyResourceExample.java b/smp-examples/resource-spi-example/src/main/java/eu/europa/ec/smp/spi/examples/def/DomiSMPPropertyResourceExample.java
index aa9cc78255ff1a3edee1e865cefae64c1c8f034a..ea15fa2c68947937e388aeec0a962e2f2d901701 100644
--- a/smp-examples/resource-spi-example/src/main/java/eu/europa/ec/smp/spi/examples/def/DomiSMPPropertyResourceExample.java
+++ b/smp-examples/resource-spi-example/src/main/java/eu/europa/ec/smp/spi/examples/def/DomiSMPPropertyResourceExample.java
@@ -2,7 +2,7 @@
* #START_LICENSE#
* resource-spi-example
* %%
- * Copyright (C) 2017 - 2023 European Commission | eDelivery | DomiSMP
+ * Copyright (C) 2017 - 2024 European Commission | eDelivery | DomiSMP
* %%
* Licensed under the EUPL, Version 1.2 or – as soon they will be approved by the European Commission - subsequent
* versions of the EUPL (the "Licence");
diff --git a/smp-examples/resource-spi-example/src/main/java/eu/europa/ec/smp/spi/examples/handler/AbstractHandler.java b/smp-examples/resource-spi-example/src/main/java/eu/europa/ec/smp/spi/examples/handler/AbstractHandler.java
index d861457e844178de228e683f99a0e8f684636047..ac763c5c0725b02556ecb82ed45489ae5fa2d478 100644
--- a/smp-examples/resource-spi-example/src/main/java/eu/europa/ec/smp/spi/examples/handler/AbstractHandler.java
+++ b/smp-examples/resource-spi-example/src/main/java/eu/europa/ec/smp/spi/examples/handler/AbstractHandler.java
@@ -2,7 +2,7 @@
* #START_LICENSE#
* resource-spi-example
* %%
- * Copyright (C) 2017 - 2023 European Commission | eDelivery | DomiSMP
+ * Copyright (C) 2017 - 2024 European Commission | eDelivery | DomiSMP
* %%
* Licensed under the EUPL, Version 1.2 or – as soon they will be approved by the European Commission - subsequent
* versions of the EUPL (the "Licence");
diff --git a/smp-examples/resource-spi-example/src/main/java/eu/europa/ec/smp/spi/examples/handler/DomiSMPJSONHandlerExample.java b/smp-examples/resource-spi-example/src/main/java/eu/europa/ec/smp/spi/examples/handler/DomiSMPJSONHandlerExample.java
index 2014420b87f0f2455792ad110faa18377e2c767b..b42c7f6a399591ccd81033a46be61aabd7d30166 100644
--- a/smp-examples/resource-spi-example/src/main/java/eu/europa/ec/smp/spi/examples/handler/DomiSMPJSONHandlerExample.java
+++ b/smp-examples/resource-spi-example/src/main/java/eu/europa/ec/smp/spi/examples/handler/DomiSMPJSONHandlerExample.java
@@ -2,7 +2,7 @@
* #START_LICENSE#
* resource-spi-example
* %%
- * Copyright (C) 2017 - 2023 European Commission | eDelivery | DomiSMP
+ * Copyright (C) 2017 - 2024 European Commission | eDelivery | DomiSMP
* %%
* Licensed under the EUPL, Version 1.2 or – as soon they will be approved by the European Commission - subsequent
* versions of the EUPL (the "Licence");
diff --git a/smp-examples/resource-spi-example/src/main/java/eu/europa/ec/smp/spi/examples/handler/DomiSMPPropertyHandlerExample.java b/smp-examples/resource-spi-example/src/main/java/eu/europa/ec/smp/spi/examples/handler/DomiSMPPropertyHandlerExample.java
index cfe280143c5fdc2fd7591cf2d1fd8a9addce26cb..99f3fb2dec03caf61b79aa52574e9bb2424f1315 100644
--- a/smp-examples/resource-spi-example/src/main/java/eu/europa/ec/smp/spi/examples/handler/DomiSMPPropertyHandlerExample.java
+++ b/smp-examples/resource-spi-example/src/main/java/eu/europa/ec/smp/spi/examples/handler/DomiSMPPropertyHandlerExample.java
@@ -2,7 +2,7 @@
* #START_LICENSE#
* resource-spi-example
* %%
- * Copyright (C) 2017 - 2023 European Commission | eDelivery | DomiSMP
+ * Copyright (C) 2017 - 2024 European Commission | eDelivery | DomiSMP
* %%
* Licensed under the EUPL, Version 1.2 or – as soon they will be approved by the European Commission - subsequent
* versions of the EUPL (the "Licence");
diff --git a/smp-examples/resource-spi-example/src/main/java/eu/europa/ec/smp/spi/examples/handler/ExampleEntityRo.java b/smp-examples/resource-spi-example/src/main/java/eu/europa/ec/smp/spi/examples/handler/ExampleEntityRo.java
index 5082661bb939244fd90edc9ce69bccdaa21b39c8..74d61855a1b209db3faf3f072db04e937649f29f 100644
--- a/smp-examples/resource-spi-example/src/main/java/eu/europa/ec/smp/spi/examples/handler/ExampleEntityRo.java
+++ b/smp-examples/resource-spi-example/src/main/java/eu/europa/ec/smp/spi/examples/handler/ExampleEntityRo.java
@@ -2,7 +2,7 @@
* #START_LICENSE#
* resource-spi-example
* %%
- * Copyright (C) 2017 - 2023 European Commission | eDelivery | DomiSMP
+ * Copyright (C) 2017 - 2024 European Commission | eDelivery | DomiSMP
* %%
* Licensed under the EUPL, Version 1.2 or – as soon they will be approved by the European Commission - subsequent
* versions of the EUPL (the "Licence");
diff --git a/smp-examples/resource-spi-example/src/test/java/eu/europa/ec/smp/spi/examples/DomiSMPResourceExampleExtensionTest.java b/smp-examples/resource-spi-example/src/test/java/eu/europa/ec/smp/spi/examples/DomiSMPResourceExampleExtensionTest.java
index 738e856ebeaa382859cc86e3ba966baf28e0f726..6a3dac4861127fd7f48e662f02f2b6e662adecaa 100644
--- a/smp-examples/resource-spi-example/src/test/java/eu/europa/ec/smp/spi/examples/DomiSMPResourceExampleExtensionTest.java
+++ b/smp-examples/resource-spi-example/src/test/java/eu/europa/ec/smp/spi/examples/DomiSMPResourceExampleExtensionTest.java
@@ -2,7 +2,7 @@
* #START_LICENSE#
* resource-spi-example
* %%
- * Copyright (C) 2017 - 2023 European Commission | eDelivery | DomiSMP
+ * Copyright (C) 2017 - 2024 European Commission | eDelivery | DomiSMP
* %%
* Licensed under the EUPL, Version 1.2 or – as soon they will be approved by the European Commission - subsequent
* versions of the EUPL (the "Licence");
diff --git a/smp-examples/resource-spi-example/src/test/java/eu/europa/ec/smp/spi/examples/def/DomiSMPJsonResourceExampleTest.java b/smp-examples/resource-spi-example/src/test/java/eu/europa/ec/smp/spi/examples/def/DomiSMPJsonResourceExampleTest.java
index 9488d7033ec05703307190e3a5cf5bcf697cba03..5c599c362cfe7207dfcabd46534c09d4fb05b06d 100644
--- a/smp-examples/resource-spi-example/src/test/java/eu/europa/ec/smp/spi/examples/def/DomiSMPJsonResourceExampleTest.java
+++ b/smp-examples/resource-spi-example/src/test/java/eu/europa/ec/smp/spi/examples/def/DomiSMPJsonResourceExampleTest.java
@@ -2,7 +2,7 @@
* #START_LICENSE#
* resource-spi-example
* %%
- * Copyright (C) 2017 - 2023 European Commission | eDelivery | DomiSMP
+ * Copyright (C) 2017 - 2024 European Commission | eDelivery | DomiSMP
* %%
* Licensed under the EUPL, Version 1.2 or – as soon they will be approved by the European Commission - subsequent
* versions of the EUPL (the "Licence");
diff --git a/smp-examples/resource-spi-example/src/test/java/eu/europa/ec/smp/spi/examples/def/DomiSMPPropertyResourceExampleTest.java b/smp-examples/resource-spi-example/src/test/java/eu/europa/ec/smp/spi/examples/def/DomiSMPPropertyResourceExampleTest.java
index 5210eb4c4be5134279d8f21d1eab457c099137ea..a04f119894683bdd378477ab23247e00733242b4 100644
--- a/smp-examples/resource-spi-example/src/test/java/eu/europa/ec/smp/spi/examples/def/DomiSMPPropertyResourceExampleTest.java
+++ b/smp-examples/resource-spi-example/src/test/java/eu/europa/ec/smp/spi/examples/def/DomiSMPPropertyResourceExampleTest.java
@@ -2,7 +2,7 @@
* #START_LICENSE#
* resource-spi-example
* %%
- * Copyright (C) 2017 - 2023 European Commission | eDelivery | DomiSMP
+ * Copyright (C) 2017 - 2024 European Commission | eDelivery | DomiSMP
* %%
* Licensed under the EUPL, Version 1.2 or – as soon they will be approved by the European Commission - subsequent
* versions of the EUPL (the "Licence");
diff --git a/smp-examples/resource-spi-example/src/test/java/eu/europa/ec/smp/spi/examples/handler/AbstractHandlerTest.java b/smp-examples/resource-spi-example/src/test/java/eu/europa/ec/smp/spi/examples/handler/AbstractHandlerTest.java
index 8303c04388368ca6f4174d8120f8aa9775ec80bd..ecbe10f3123723123c88df50b82cf6aece2d8a6e 100644
--- a/smp-examples/resource-spi-example/src/test/java/eu/europa/ec/smp/spi/examples/handler/AbstractHandlerTest.java
+++ b/smp-examples/resource-spi-example/src/test/java/eu/europa/ec/smp/spi/examples/handler/AbstractHandlerTest.java
@@ -2,7 +2,7 @@
* #START_LICENSE#
* resource-spi-example
* %%
- * Copyright (C) 2017 - 2023 European Commission | eDelivery | DomiSMP
+ * Copyright (C) 2017 - 2024 European Commission | eDelivery | DomiSMP
* %%
* Licensed under the EUPL, Version 1.2 or – as soon they will be approved by the European Commission - subsequent
* versions of the EUPL (the "Licence");
diff --git a/smp-examples/resource-spi-example/src/test/java/eu/europa/ec/smp/spi/examples/handler/DomiSMPJSONHandlerExampleTest.java b/smp-examples/resource-spi-example/src/test/java/eu/europa/ec/smp/spi/examples/handler/DomiSMPJSONHandlerExampleTest.java
index 6224a4a63c407cacdde79c1f6016c4772a10c10a..16d5e4c8dc7095f1df1ebe0502e10bfb33ce1a39 100644
--- a/smp-examples/resource-spi-example/src/test/java/eu/europa/ec/smp/spi/examples/handler/DomiSMPJSONHandlerExampleTest.java
+++ b/smp-examples/resource-spi-example/src/test/java/eu/europa/ec/smp/spi/examples/handler/DomiSMPJSONHandlerExampleTest.java
@@ -2,7 +2,7 @@
* #START_LICENSE#
* resource-spi-example
* %%
- * Copyright (C) 2017 - 2023 European Commission | eDelivery | DomiSMP
+ * Copyright (C) 2017 - 2024 European Commission | eDelivery | DomiSMP
* %%
* Licensed under the EUPL, Version 1.2 or – as soon they will be approved by the European Commission - subsequent
* versions of the EUPL (the "Licence");
diff --git a/smp-examples/resource-spi-example/src/test/java/eu/europa/ec/smp/spi/examples/handler/DomiSMPPropertyHandlerExampleTest.java b/smp-examples/resource-spi-example/src/test/java/eu/europa/ec/smp/spi/examples/handler/DomiSMPPropertyHandlerExampleTest.java
index 87f07c8db588dd197a464ee01ec3b26cf5bb655a..30b6e5e914fc5cdc8bfc804ed3927a1dfbef2155 100644
--- a/smp-examples/resource-spi-example/src/test/java/eu/europa/ec/smp/spi/examples/handler/DomiSMPPropertyHandlerExampleTest.java
+++ b/smp-examples/resource-spi-example/src/test/java/eu/europa/ec/smp/spi/examples/handler/DomiSMPPropertyHandlerExampleTest.java
@@ -2,7 +2,7 @@
* #START_LICENSE#
* resource-spi-example
* %%
- * Copyright (C) 2017 - 2023 European Commission | eDelivery | DomiSMP
+ * Copyright (C) 2017 - 2024 European Commission | eDelivery | DomiSMP
* %%
* Licensed under the EUPL, Version 1.2 or – as soon they will be approved by the European Commission - subsequent
* versions of the EUPL (the "Licence");
diff --git a/smp-examples/resource-spi-example/src/test/resources/examples/properties_ok.properties b/smp-examples/resource-spi-example/src/test/resources/examples/properties_ok.properties
index 0f0d47e12d5396fae439286aed4523223a270836..e2debc00dfd723eee5347e8f20c9e042d829a00f 100644
--- a/smp-examples/resource-spi-example/src/test/resources/examples/properties_ok.properties
+++ b/smp-examples/resource-spi-example/src/test/resources/examples/properties_ok.properties
@@ -2,7 +2,7 @@
# #START_LICENSE#
# resource-spi-example
# %%
-# Copyright (C) 2017 - 2023 European Commission | eDelivery | DomiSMP
+# Copyright (C) 2017 - 2024 European Commission | eDelivery | DomiSMP
# %%
# Licensed under the EUPL, Version 1.2 or – as soon they will be approved by the European Commission - subsequent
# versions of the EUPL (the "Licence");
diff --git a/smp-examples/smp-spi-payload-validation-example/src/main/java/eu/europa/ec/smp/spi/ExamplePayloadValidatorSpiImpl.java b/smp-examples/smp-spi-payload-validation-example/src/main/java/eu/europa/ec/smp/spi/ExamplePayloadValidatorSpiImpl.java
index 0f22b0204905c2b13a86f9094e5fb36508a3b760..8404b7c7601cf6a8604b420e701d50296560abba 100644
--- a/smp-examples/smp-spi-payload-validation-example/src/main/java/eu/europa/ec/smp/spi/ExamplePayloadValidatorSpiImpl.java
+++ b/smp-examples/smp-spi-payload-validation-example/src/main/java/eu/europa/ec/smp/spi/ExamplePayloadValidatorSpiImpl.java
@@ -2,7 +2,7 @@
* #START_LICENSE#
* smp-spi-payload-validation-example
* %%
- * Copyright (C) 2017 - 2023 European Commission | eDelivery | DomiSMP
+ * Copyright (C) 2017 - 2024 European Commission | eDelivery | DomiSMP
* %%
* Licensed under the EUPL, Version 1.2 or – as soon they will be approved by the European Commission - subsequent
* versions of the EUPL (the "Licence");
diff --git a/smp-examples/smp-spi-payload-validation-example/src/main/resources/logback.xml b/smp-examples/smp-spi-payload-validation-example/src/main/resources/logback.xml
index 64fb2078710c71fa754da18f760eb50a04e02406..a2a840a2e500ca81a5c6af844394f97794e374a8 100644
--- a/smp-examples/smp-spi-payload-validation-example/src/main/resources/logback.xml
+++ b/smp-examples/smp-spi-payload-validation-example/src/main/resources/logback.xml
@@ -3,7 +3,7 @@
#START_LICENSE#
smp-spi-payload-validation-example
%%
- Copyright (C) 2017 - 2023 European Commission | eDelivery | DomiSMP
+ Copyright (C) 2017 - 2024 European Commission | eDelivery | DomiSMP
%%
Licensed under the EUPL, Version 1.2 or – as soon they will be approved by the European Commission - subsequent
versions of the EUPL (the "Licence");
diff --git a/smp-resource-extensions/oasis-cppa3-spi/src/main/java/eu/europa/ec/smp/spi/OasisCPPA3Extension.java b/smp-resource-extensions/oasis-cppa3-spi/src/main/java/eu/europa/ec/smp/spi/OasisCPPA3Extension.java
index 8db54527f9b7c11e301a4f856e5f497c3f86aef4..0d071a6722eebe8336920a1683ddcb41589f1f06 100644
--- a/smp-resource-extensions/oasis-cppa3-spi/src/main/java/eu/europa/ec/smp/spi/OasisCPPA3Extension.java
+++ b/smp-resource-extensions/oasis-cppa3-spi/src/main/java/eu/europa/ec/smp/spi/OasisCPPA3Extension.java
@@ -2,7 +2,7 @@
* #START_LICENSE#
* oasis-cppa3-spi
* %%
- * Copyright (C) 2017 - 2023 European Commission | eDelivery | DomiSMP
+ * Copyright (C) 2017 - 2024 European Commission | eDelivery | DomiSMP
* %%
* Licensed under the EUPL, Version 1.2 or – as soon they will be approved by the European Commission - subsequent
* versions of the EUPL (the "Licence");
diff --git a/smp-resource-extensions/oasis-cppa3-spi/src/main/java/eu/europa/ec/smp/spi/def/OasisCppaCppDocument.java b/smp-resource-extensions/oasis-cppa3-spi/src/main/java/eu/europa/ec/smp/spi/def/OasisCppaCppDocument.java
index f415741a3cd661d5857e47331220f94f0ed8ba5f..71811cc4ef701786cdc353889893c9a8aada12f2 100644
--- a/smp-resource-extensions/oasis-cppa3-spi/src/main/java/eu/europa/ec/smp/spi/def/OasisCppaCppDocument.java
+++ b/smp-resource-extensions/oasis-cppa3-spi/src/main/java/eu/europa/ec/smp/spi/def/OasisCppaCppDocument.java
@@ -2,7 +2,7 @@
* #START_LICENSE#
* oasis-cppa3-spi
* %%
- * Copyright (C) 2017 - 2023 European Commission | eDelivery | DomiSMP
+ * Copyright (C) 2017 - 2024 European Commission | eDelivery | DomiSMP
* %%
* Licensed under the EUPL, Version 1.2 or – as soon they will be approved by the European Commission - subsequent
* versions of the EUPL (the "Licence");
diff --git a/smp-resource-extensions/oasis-cppa3-spi/src/main/java/eu/europa/ec/smp/spi/exceptions/CPPARuntimeException.java b/smp-resource-extensions/oasis-cppa3-spi/src/main/java/eu/europa/ec/smp/spi/exceptions/CPPARuntimeException.java
index bf135b13f460f6d703a5eb253528cee7d25578fc..de0a34418bd913a3614911cf4ef742a37147ace3 100644
--- a/smp-resource-extensions/oasis-cppa3-spi/src/main/java/eu/europa/ec/smp/spi/exceptions/CPPARuntimeException.java
+++ b/smp-resource-extensions/oasis-cppa3-spi/src/main/java/eu/europa/ec/smp/spi/exceptions/CPPARuntimeException.java
@@ -2,7 +2,7 @@
* #START_LICENSE#
* oasis-cppa3-spi
* %%
- * Copyright (C) 2017 - 2023 European Commission | eDelivery | DomiSMP
+ * Copyright (C) 2017 - 2024 European Commission | eDelivery | DomiSMP
* %%
* Licensed under the EUPL, Version 1.2 or – as soon they will be approved by the European Commission - subsequent
* versions of the EUPL (the "Licence");
diff --git a/smp-resource-extensions/oasis-cppa3-spi/src/main/java/eu/europa/ec/smp/spi/handler/AbstractHandler.java b/smp-resource-extensions/oasis-cppa3-spi/src/main/java/eu/europa/ec/smp/spi/handler/AbstractHandler.java
index 6ba174c35826800e7e6c310ded5917df9e7dff5e..e5b26a1485aec582c3cf5c49b521b1e02604d7bb 100644
--- a/smp-resource-extensions/oasis-cppa3-spi/src/main/java/eu/europa/ec/smp/spi/handler/AbstractHandler.java
+++ b/smp-resource-extensions/oasis-cppa3-spi/src/main/java/eu/europa/ec/smp/spi/handler/AbstractHandler.java
@@ -2,7 +2,7 @@
* #START_LICENSE#
* oasis-cppa3-spi
* %%
- * Copyright (C) 2017 - 2023 European Commission | eDelivery | DomiSMP
+ * Copyright (C) 2017 - 2024 European Commission | eDelivery | DomiSMP
* %%
* Licensed under the EUPL, Version 1.2 or – as soon they will be approved by the European Commission - subsequent
* versions of the EUPL (the "Licence");
diff --git a/smp-resource-extensions/oasis-cppa3-spi/src/main/java/eu/europa/ec/smp/spi/handler/OasisCppa3CppHandler.java b/smp-resource-extensions/oasis-cppa3-spi/src/main/java/eu/europa/ec/smp/spi/handler/OasisCppa3CppHandler.java
index c784c291cf82aa60a1e3094c183b680a67c0d02d..0a8521e7c898b5c310bc21955f0730da6dad8a08 100644
--- a/smp-resource-extensions/oasis-cppa3-spi/src/main/java/eu/europa/ec/smp/spi/handler/OasisCppa3CppHandler.java
+++ b/smp-resource-extensions/oasis-cppa3-spi/src/main/java/eu/europa/ec/smp/spi/handler/OasisCppa3CppHandler.java
@@ -2,7 +2,7 @@
* #START_LICENSE#
* oasis-cppa3-spi
* %%
- * Copyright (C) 2017 - 2023 European Commission | eDelivery | DomiSMP
+ * Copyright (C) 2017 - 2024 European Commission | eDelivery | DomiSMP
* %%
* Licensed under the EUPL, Version 1.2 or – as soon they will be approved by the European Commission - subsequent
* versions of the EUPL (the "Licence");
diff --git a/smp-resource-extensions/oasis-cppa3-spi/src/main/java/eu/europa/ec/smp/spi/utils/CPPUtils.java b/smp-resource-extensions/oasis-cppa3-spi/src/main/java/eu/europa/ec/smp/spi/utils/CPPUtils.java
index 1c527c60c46f59a5fb0d204f2c786944cef01adc..40a98898df1ba2496d60918176e7d3a8628a78d5 100644
--- a/smp-resource-extensions/oasis-cppa3-spi/src/main/java/eu/europa/ec/smp/spi/utils/CPPUtils.java
+++ b/smp-resource-extensions/oasis-cppa3-spi/src/main/java/eu/europa/ec/smp/spi/utils/CPPUtils.java
@@ -2,7 +2,7 @@
* #START_LICENSE#
* oasis-cppa3-spi
* %%
- * Copyright (C) 2017 - 2023 European Commission | eDelivery | DomiSMP
+ * Copyright (C) 2017 - 2024 European Commission | eDelivery | DomiSMP
* %%
* Licensed under the EUPL, Version 1.2 or – as soon they will be approved by the European Commission - subsequent
* versions of the EUPL (the "Licence");
diff --git a/smp-resource-extensions/oasis-cppa3-spi/src/main/java/eu/europa/ec/smp/spi/utils/DatatypeConverter.java b/smp-resource-extensions/oasis-cppa3-spi/src/main/java/eu/europa/ec/smp/spi/utils/DatatypeConverter.java
index 5ad78d3436d30f5c6f9dae370caf91b920767986..0a21b532ce84cab799488f5565bb14d4ef162821 100644
--- a/smp-resource-extensions/oasis-cppa3-spi/src/main/java/eu/europa/ec/smp/spi/utils/DatatypeConverter.java
+++ b/smp-resource-extensions/oasis-cppa3-spi/src/main/java/eu/europa/ec/smp/spi/utils/DatatypeConverter.java
@@ -2,7 +2,7 @@
* #START_LICENSE#
* oasis-cppa3-spi
* %%
- * Copyright (C) 2017 - 2023 European Commission | eDelivery | DomiSMP
+ * Copyright (C) 2017 - 2024 European Commission | eDelivery | DomiSMP
* %%
* Licensed under the EUPL, Version 1.2 or – as soon they will be approved by the European Commission - subsequent
* versions of the EUPL (the "Licence");
diff --git a/smp-resource-extensions/oasis-cppa3-spi/src/main/java/eu/europa/ec/smp/spi/utils/xml/OffsetDateAdapter.java b/smp-resource-extensions/oasis-cppa3-spi/src/main/java/eu/europa/ec/smp/spi/utils/xml/OffsetDateAdapter.java
index aabc51278038cfe3f5c98cb9177f120c1e0e6ab8..15b51cdc61281ecb9460660eb8e9299cebf6c660 100644
--- a/smp-resource-extensions/oasis-cppa3-spi/src/main/java/eu/europa/ec/smp/spi/utils/xml/OffsetDateAdapter.java
+++ b/smp-resource-extensions/oasis-cppa3-spi/src/main/java/eu/europa/ec/smp/spi/utils/xml/OffsetDateAdapter.java
@@ -2,7 +2,7 @@
* #START_LICENSE#
* oasis-cppa3-spi
* %%
- * Copyright (C) 2017 - 2023 European Commission | eDelivery | DomiSMP
+ * Copyright (C) 2017 - 2024 European Commission | eDelivery | DomiSMP
* %%
* Licensed under the EUPL, Version 1.2 or – as soon they will be approved by the European Commission - subsequent
* versions of the EUPL (the "Licence");
@@ -16,22 +16,19 @@
* See the Licence for the specific language governing permissions and limitations under the Licence.
* #END_LICENSE#
*/
-
-/**
- * Purpose of the class it to provide OffsetDateTime to string and string to OffsetDateTime conversion
- *
- * @author Joze Rihtarsic
- * @since 2.0
- */
-
package eu.europa.ec.smp.spi.utils.xml;
-
import eu.europa.ec.smp.spi.utils.DatatypeConverter;
import javax.xml.bind.annotation.adapters.XmlAdapter;
import java.time.OffsetDateTime;
+/**
+ * Purpose of the class it to provide OffsetDateTime to string and string to OffsetDateTime conversion
+ *
+ * @author Joze Rihtarsic
+ * @since 2.0
+ */
public class OffsetDateAdapter
extends XmlAdapter<String, OffsetDateTime>
{
diff --git a/smp-resource-extensions/oasis-cppa3-spi/src/main/java/eu/europa/ec/smp/spi/utils/xml/OffsetDateTimeAdapter.java b/smp-resource-extensions/oasis-cppa3-spi/src/main/java/eu/europa/ec/smp/spi/utils/xml/OffsetDateTimeAdapter.java
index 914d56c4b2bbf3062b2b214295bcd3550fd1b2e5..bf7b476bf0c9b27d23ddc4787eb5ffb14d301a4b 100644
--- a/smp-resource-extensions/oasis-cppa3-spi/src/main/java/eu/europa/ec/smp/spi/utils/xml/OffsetDateTimeAdapter.java
+++ b/smp-resource-extensions/oasis-cppa3-spi/src/main/java/eu/europa/ec/smp/spi/utils/xml/OffsetDateTimeAdapter.java
@@ -2,7 +2,7 @@
* #START_LICENSE#
* oasis-cppa3-spi
* %%
- * Copyright (C) 2017 - 2023 European Commission | eDelivery | DomiSMP
+ * Copyright (C) 2017 - 2024 European Commission | eDelivery | DomiSMP
* %%
* Licensed under the EUPL, Version 1.2 or – as soon they will be approved by the European Commission - subsequent
* versions of the EUPL (the "Licence");
@@ -16,14 +16,6 @@
* See the Licence for the specific language governing permissions and limitations under the Licence.
* #END_LICENSE#
*/
-
-/**
- * Purpose of the class it to provide OffsetDateTime to string and string to OffsetDateTime conversion
- *
- * @author Joze Rihtarsic
- * @since 2.0
- */
-
package eu.europa.ec.smp.spi.utils.xml;
import eu.europa.ec.smp.spi.utils.DatatypeConverter;
@@ -31,6 +23,12 @@ import eu.europa.ec.smp.spi.utils.DatatypeConverter;
import javax.xml.bind.annotation.adapters.XmlAdapter;
import java.time.OffsetDateTime;
+/**
+ * Purpose of the class it to provide OffsetDateTime to string and string to OffsetDateTime conversion
+ *
+ * @author Joze Rihtarsic
+ * @since 2.0
+ */
public class OffsetDateTimeAdapter
extends XmlAdapter<String, OffsetDateTime>
{
diff --git a/smp-resource-extensions/oasis-cppa3-spi/src/main/resources/xjb/commonServiceBinding.xjb b/smp-resource-extensions/oasis-cppa3-spi/src/main/resources/xjb/commonServiceBinding.xjb
index 0956075c67edc7ae7963da89efc5c830dda1b265..539d34e1143d931ca3a1413adf4bf130fa728aa8 100644
--- a/smp-resource-extensions/oasis-cppa3-spi/src/main/resources/xjb/commonServiceBinding.xjb
+++ b/smp-resource-extensions/oasis-cppa3-spi/src/main/resources/xjb/commonServiceBinding.xjb
@@ -3,7 +3,7 @@
#START_LICENSE#
oasis-cppa3-spi
%%
- Copyright (C) 2017 - 2023 European Commission | eDelivery | DomiSMP
+ Copyright (C) 2017 - 2024 European Commission | eDelivery | DomiSMP
%%
Licensed under the EUPL, Version 1.2 or – as soon they will be approved by the European Commission - subsequent
versions of the EUPL (the "Licence");
diff --git a/smp-resource-extensions/oasis-cppa3-spi/src/main/resources/xjb/oasisCppa3Binding.xjb b/smp-resource-extensions/oasis-cppa3-spi/src/main/resources/xjb/oasisCppa3Binding.xjb
index 3f101b3958ae2842a709582b0f63cf09dc2d2705..e4e712c4779f5199106c2cf4f1f8bba809ea91a0 100644
--- a/smp-resource-extensions/oasis-cppa3-spi/src/main/resources/xjb/oasisCppa3Binding.xjb
+++ b/smp-resource-extensions/oasis-cppa3-spi/src/main/resources/xjb/oasisCppa3Binding.xjb
@@ -3,7 +3,7 @@
#START_LICENSE#
oasis-cppa3-spi
%%
- Copyright (C) 2017 - 2023 European Commission | eDelivery | DomiSMP
+ Copyright (C) 2017 - 2024 European Commission | eDelivery | DomiSMP
%%
Licensed under the EUPL, Version 1.2 or – as soon they will be approved by the European Commission - subsequent
versions of the EUPL (the "Licence");
diff --git a/smp-resource-extensions/oasis-cppa3-spi/src/test/java/eu/europa/ec/smp/spi/OasisCPPA3ExtensionTest.java b/smp-resource-extensions/oasis-cppa3-spi/src/test/java/eu/europa/ec/smp/spi/OasisCPPA3ExtensionTest.java
index be0689b41068bd4dafa4b95289ee470a09b676cb..3627c148b047fa6c32b429fe23749f49d04f3249 100644
--- a/smp-resource-extensions/oasis-cppa3-spi/src/test/java/eu/europa/ec/smp/spi/OasisCPPA3ExtensionTest.java
+++ b/smp-resource-extensions/oasis-cppa3-spi/src/test/java/eu/europa/ec/smp/spi/OasisCPPA3ExtensionTest.java
@@ -2,7 +2,7 @@
* #START_LICENSE#
* oasis-cppa3-spi
* %%
- * Copyright (C) 2017 - 2023 European Commission | eDelivery | DomiSMP
+ * Copyright (C) 2017 - 2024 European Commission | eDelivery | DomiSMP
* %%
* Licensed under the EUPL, Version 1.2 or – as soon they will be approved by the European Commission - subsequent
* versions of the EUPL (the "Licence");
diff --git a/smp-resource-extensions/oasis-cppa3-spi/src/test/java/eu/europa/ec/smp/spi/def/OasisCppaCppDocumentTest.java b/smp-resource-extensions/oasis-cppa3-spi/src/test/java/eu/europa/ec/smp/spi/def/OasisCppaCppDocumentTest.java
index 586afa1229fe3361ba3b7c08f97f5e66062e104e..8776b55dcf23012f557567ddd47f47aa14c2c6bc 100644
--- a/smp-resource-extensions/oasis-cppa3-spi/src/test/java/eu/europa/ec/smp/spi/def/OasisCppaCppDocumentTest.java
+++ b/smp-resource-extensions/oasis-cppa3-spi/src/test/java/eu/europa/ec/smp/spi/def/OasisCppaCppDocumentTest.java
@@ -2,7 +2,7 @@
* #START_LICENSE#
* oasis-cppa3-spi
* %%
- * Copyright (C) 2017 - 2023 European Commission | eDelivery | DomiSMP
+ * Copyright (C) 2017 - 2024 European Commission | eDelivery | DomiSMP
* %%
* Licensed under the EUPL, Version 1.2 or – as soon they will be approved by the European Commission - subsequent
* versions of the EUPL (the "Licence");
diff --git a/smp-resource-extensions/oasis-cppa3-spi/src/test/java/eu/europa/ec/smp/spi/handler/AbstractHandlerTest.java b/smp-resource-extensions/oasis-cppa3-spi/src/test/java/eu/europa/ec/smp/spi/handler/AbstractHandlerTest.java
index 764815d9a98f790803443a4598dacd685198c7e9..614bb23f22a6efb807f2c40dbd0ed3cee43317e4 100644
--- a/smp-resource-extensions/oasis-cppa3-spi/src/test/java/eu/europa/ec/smp/spi/handler/AbstractHandlerTest.java
+++ b/smp-resource-extensions/oasis-cppa3-spi/src/test/java/eu/europa/ec/smp/spi/handler/AbstractHandlerTest.java
@@ -2,7 +2,7 @@
* #START_LICENSE#
* oasis-cppa3-spi
* %%
- * Copyright (C) 2017 - 2023 European Commission | eDelivery | DomiSMP
+ * Copyright (C) 2017 - 2024 European Commission | eDelivery | DomiSMP
* %%
* Licensed under the EUPL, Version 1.2 or – as soon they will be approved by the European Commission - subsequent
* versions of the EUPL (the "Licence");
diff --git a/smp-resource-extensions/oasis-cppa3-spi/src/test/java/eu/europa/ec/smp/spi/handler/OasisCppa3CppHandlerTest.java b/smp-resource-extensions/oasis-cppa3-spi/src/test/java/eu/europa/ec/smp/spi/handler/OasisCppa3CppHandlerTest.java
index 7b6d1e79d759cf5fe09339ffad05951291ed4af8..958617181d85afcc7226bffc7337a28231a049c3 100644
--- a/smp-resource-extensions/oasis-cppa3-spi/src/test/java/eu/europa/ec/smp/spi/handler/OasisCppa3CppHandlerTest.java
+++ b/smp-resource-extensions/oasis-cppa3-spi/src/test/java/eu/europa/ec/smp/spi/handler/OasisCppa3CppHandlerTest.java
@@ -2,7 +2,7 @@
* #START_LICENSE#
* oasis-cppa3-spi
* %%
- * Copyright (C) 2017 - 2023 European Commission | eDelivery | DomiSMP
+ * Copyright (C) 2017 - 2024 European Commission | eDelivery | DomiSMP
* %%
* Licensed under the EUPL, Version 1.2 or – as soon they will be approved by the European Commission - subsequent
* versions of the EUPL (the "Licence");
diff --git a/smp-resource-extensions/oasis-cppa3-spi/src/test/java/eu/europa/ec/smp/spi/utils/DatatypeConverterTest.java b/smp-resource-extensions/oasis-cppa3-spi/src/test/java/eu/europa/ec/smp/spi/utils/DatatypeConverterTest.java
index 56410596a8c2a6f7406705ef82b164b70f0e0b65..2b4cef9c5283b42eece15c7864ea14599c058922 100644
--- a/smp-resource-extensions/oasis-cppa3-spi/src/test/java/eu/europa/ec/smp/spi/utils/DatatypeConverterTest.java
+++ b/smp-resource-extensions/oasis-cppa3-spi/src/test/java/eu/europa/ec/smp/spi/utils/DatatypeConverterTest.java
@@ -2,7 +2,7 @@
* #START_LICENSE#
* oasis-cppa3-spi
* %%
- * Copyright (C) 2017 - 2023 European Commission | eDelivery | DomiSMP
+ * Copyright (C) 2017 - 2024 European Commission | eDelivery | DomiSMP
* %%
* Licensed under the EUPL, Version 1.2 or – as soon they will be approved by the European Commission - subsequent
* versions of the EUPL (the "Licence");
diff --git a/smp-resource-extensions/oasis-cppa3-spi/src/test/resources/examples/signed-cpp-With-DOCTYPE.xml b/smp-resource-extensions/oasis-cppa3-spi/src/test/resources/examples/signed-cpp-With-DOCTYPE.xml
index b3056efe0a71b3d0c876e2b58ca184eba68950a0..fe24732ce34130a1844a6108fbc80c7a826ab1ab 100644
--- a/smp-resource-extensions/oasis-cppa3-spi/src/test/resources/examples/signed-cpp-With-DOCTYPE.xml
+++ b/smp-resource-extensions/oasis-cppa3-spi/src/test/resources/examples/signed-cpp-With-DOCTYPE.xml
@@ -3,7 +3,7 @@
#START_LICENSE#
oasis-cppa3-spi
%%
- Copyright (C) 2017 - 2023 European Commission | eDelivery | DomiSMP
+ Copyright (C) 2017 - 2024 European Commission | eDelivery | DomiSMP
%%
Licensed under the EUPL, Version 1.2 or – as soon they will be approved by the European Commission - subsequent
versions of the EUPL (the "Licence");
diff --git a/smp-resource-extensions/oasis-cppa3-spi/src/test/resources/examples/signed-cpp-invalid.xml b/smp-resource-extensions/oasis-cppa3-spi/src/test/resources/examples/signed-cpp-invalid.xml
index 0890b7e9137aef610a20cff447ea87578f21b780..a7453876c825b5e9f60e393136de56dc7e9abb96 100644
--- a/smp-resource-extensions/oasis-cppa3-spi/src/test/resources/examples/signed-cpp-invalid.xml
+++ b/smp-resource-extensions/oasis-cppa3-spi/src/test/resources/examples/signed-cpp-invalid.xml
@@ -3,7 +3,7 @@
#START_LICENSE#
oasis-cppa3-spi
%%
- Copyright (C) 2017 - 2023 European Commission | eDelivery | DomiSMP
+ Copyright (C) 2017 - 2024 European Commission | eDelivery | DomiSMP
%%
Licensed under the EUPL, Version 1.2 or – as soon they will be approved by the European Commission - subsequent
versions of the EUPL (the "Licence");
diff --git a/smp-resource-extensions/oasis-cppa3-spi/src/test/resources/examples/signed-cpp.xml b/smp-resource-extensions/oasis-cppa3-spi/src/test/resources/examples/signed-cpp.xml
index 09d073d5a06058a2daf24404702d1906267e0eab..7b5a8e1aec34e0a29af21f899a09d8f7a42e829a 100644
--- a/smp-resource-extensions/oasis-cppa3-spi/src/test/resources/examples/signed-cpp.xml
+++ b/smp-resource-extensions/oasis-cppa3-spi/src/test/resources/examples/signed-cpp.xml
@@ -3,7 +3,7 @@
#START_LICENSE#
oasis-cppa3-spi
%%
- Copyright (C) 2017 - 2023 European Commission | eDelivery | DomiSMP
+ Copyright (C) 2017 - 2024 European Commission | eDelivery | DomiSMP
%%
Licensed under the EUPL, Version 1.2 or – as soon they will be approved by the European Commission - subsequent
versions of the EUPL (the "Licence");
diff --git a/smp-resource-extensions/oasis-smp-spi/src/main/java/eu/europa/ec/smp/spi/OasisSMPExtension.java b/smp-resource-extensions/oasis-smp-spi/src/main/java/eu/europa/ec/smp/spi/OasisSMPExtension.java
index 818d9c97cade8406f683b1defd651b0b138a843a..7b6b600dfbe31aad9aa07834bbca93d3613b6ce9 100644
--- a/smp-resource-extensions/oasis-smp-spi/src/main/java/eu/europa/ec/smp/spi/OasisSMPExtension.java
+++ b/smp-resource-extensions/oasis-smp-spi/src/main/java/eu/europa/ec/smp/spi/OasisSMPExtension.java
@@ -2,7 +2,7 @@
* #START_LICENSE#
* oasis-smp-spi
* %%
- * Copyright (C) 2017 - 2023 European Commission | eDelivery | DomiSMP
+ * Copyright (C) 2017 - 2024 European Commission | eDelivery | DomiSMP
* %%
* Licensed under the EUPL, Version 1.2 or – as soon they will be approved by the European Commission - subsequent
* versions of the EUPL (the "Licence");
diff --git a/smp-resource-extensions/oasis-smp-spi/src/main/java/eu/europa/ec/smp/spi/converter/DomUtils.java b/smp-resource-extensions/oasis-smp-spi/src/main/java/eu/europa/ec/smp/spi/converter/DomUtils.java
index 2136aa85006f0ea102db8a892059591f364c6233..671fd5220c85d80d755ed387b7441b7eff76a6ab 100644
--- a/smp-resource-extensions/oasis-smp-spi/src/main/java/eu/europa/ec/smp/spi/converter/DomUtils.java
+++ b/smp-resource-extensions/oasis-smp-spi/src/main/java/eu/europa/ec/smp/spi/converter/DomUtils.java
@@ -2,7 +2,7 @@
* #START_LICENSE#
* smp-webapp
* %%
- * Copyright (C) 2017 - 2023 European Commission | eDelivery | DomiSMP
+ * Copyright (C) 2017 - 2024 European Commission | eDelivery | DomiSMP
* %%
* Licensed under the EUPL, Version 1.2 or – as soon they will be approved by the European Commission - subsequent
* versions of the EUPL (the "Licence");
@@ -79,10 +79,9 @@ public final class DomUtils {
}
- public static Document parse(byte[] subresourceXml) throws SAXException, IOException, ParserConfigurationException {
+ public static Document parse(byte[] subresourceXml) throws SAXException, IOException, ParserConfigurationException, ResourceException {
if (subresourceXml == null) {
- LOG.warn("ServiceMetadataXml bytearray is null!");
- return null;
+ throw new ResourceException(INVALID_RESOURCE, "Invalid serviceMetadataXml: null");
}
LOG.debug("Parse document with size [{}]", subresourceXml.length);
InputStream inputStream = new ByteArrayInputStream(subresourceXml);
diff --git a/smp-resource-extensions/oasis-smp-spi/src/main/java/eu/europa/ec/smp/spi/def/OasisSMPResource10.java b/smp-resource-extensions/oasis-smp-spi/src/main/java/eu/europa/ec/smp/spi/def/OasisSMPResource10.java
index 4d8b77fbdc0b4b921b15c7ae5707884ff60e965e..07deefe7b5b5beed05a8d9ad343082c0763c04ea 100644
--- a/smp-resource-extensions/oasis-smp-spi/src/main/java/eu/europa/ec/smp/spi/def/OasisSMPResource10.java
+++ b/smp-resource-extensions/oasis-smp-spi/src/main/java/eu/europa/ec/smp/spi/def/OasisSMPResource10.java
@@ -2,7 +2,7 @@
* #START_LICENSE#
* oasis-smp-spi
* %%
- * Copyright (C) 2017 - 2023 European Commission | eDelivery | DomiSMP
+ * Copyright (C) 2017 - 2024 European Commission | eDelivery | DomiSMP
* %%
* Licensed under the EUPL, Version 1.2 or – as soon they will be approved by the European Commission - subsequent
* versions of the EUPL (the "Licence");
diff --git a/smp-resource-extensions/oasis-smp-spi/src/main/java/eu/europa/ec/smp/spi/def/OasisSMPResource20.java b/smp-resource-extensions/oasis-smp-spi/src/main/java/eu/europa/ec/smp/spi/def/OasisSMPResource20.java
index 74b1141eb947276c1f48a82bd24eb282017ab4df..d1cc8b4038ca883f9537ff556a6bf3fc3d5813d0 100644
--- a/smp-resource-extensions/oasis-smp-spi/src/main/java/eu/europa/ec/smp/spi/def/OasisSMPResource20.java
+++ b/smp-resource-extensions/oasis-smp-spi/src/main/java/eu/europa/ec/smp/spi/def/OasisSMPResource20.java
@@ -2,7 +2,7 @@
* #START_LICENSE#
* oasis-smp-spi
* %%
- * Copyright (C) 2017 - 2023 European Commission | eDelivery | DomiSMP
+ * Copyright (C) 2017 - 2024 European Commission | eDelivery | DomiSMP
* %%
* Licensed under the EUPL, Version 1.2 or – as soon they will be approved by the European Commission - subsequent
* versions of the EUPL (the "Licence");
diff --git a/smp-resource-extensions/oasis-smp-spi/src/main/java/eu/europa/ec/smp/spi/def/OasisSMPSubresource10.java b/smp-resource-extensions/oasis-smp-spi/src/main/java/eu/europa/ec/smp/spi/def/OasisSMPSubresource10.java
index 3ec9e868004ab42a2c5b2774168dd107a819b397..99ff5dec40d93bbb79eb1981a1ad04950e50b80d 100644
--- a/smp-resource-extensions/oasis-smp-spi/src/main/java/eu/europa/ec/smp/spi/def/OasisSMPSubresource10.java
+++ b/smp-resource-extensions/oasis-smp-spi/src/main/java/eu/europa/ec/smp/spi/def/OasisSMPSubresource10.java
@@ -2,7 +2,7 @@
* #START_LICENSE#
* oasis-smp-spi
* %%
- * Copyright (C) 2017 - 2023 European Commission | eDelivery | DomiSMP
+ * Copyright (C) 2017 - 2024 European Commission | eDelivery | DomiSMP
* %%
* Licensed under the EUPL, Version 1.2 or – as soon they will be approved by the European Commission - subsequent
* versions of the EUPL (the "Licence");
diff --git a/smp-resource-extensions/oasis-smp-spi/src/main/java/eu/europa/ec/smp/spi/def/OasisSMPSubresource20.java b/smp-resource-extensions/oasis-smp-spi/src/main/java/eu/europa/ec/smp/spi/def/OasisSMPSubresource20.java
index 85897f5583a76b3da4eb6e78e2a5aed969e4b645..7e80ae91d3feb13d874fdaf50495154278ec64c3 100644
--- a/smp-resource-extensions/oasis-smp-spi/src/main/java/eu/europa/ec/smp/spi/def/OasisSMPSubresource20.java
+++ b/smp-resource-extensions/oasis-smp-spi/src/main/java/eu/europa/ec/smp/spi/def/OasisSMPSubresource20.java
@@ -2,7 +2,7 @@
* #START_LICENSE#
* oasis-smp-spi
* %%
- * Copyright (C) 2017 - 2023 European Commission | eDelivery | DomiSMP
+ * Copyright (C) 2017 - 2024 European Commission | eDelivery | DomiSMP
* %%
* Licensed under the EUPL, Version 1.2 or – as soon they will be approved by the European Commission - subsequent
* versions of the EUPL (the "Licence");
diff --git a/smp-resource-extensions/oasis-smp-spi/src/main/java/eu/europa/ec/smp/spi/exceptions/MalformedIdentifierException.java b/smp-resource-extensions/oasis-smp-spi/src/main/java/eu/europa/ec/smp/spi/exceptions/MalformedIdentifierException.java
index 1b9a485cf0d59aaab68845ff63d27f69a226d4c6..794cb185059715df5fc5ff32add91feb07b97229 100644
--- a/smp-resource-extensions/oasis-smp-spi/src/main/java/eu/europa/ec/smp/spi/exceptions/MalformedIdentifierException.java
+++ b/smp-resource-extensions/oasis-smp-spi/src/main/java/eu/europa/ec/smp/spi/exceptions/MalformedIdentifierException.java
@@ -2,7 +2,7 @@
* #START_LICENSE#
* smp-webapp
* %%
- * Copyright (C) 2017 - 2023 European Commission | eDelivery | DomiSMP
+ * Copyright (C) 2017 - 2024 European Commission | eDelivery | DomiSMP
* %%
* Licensed under the EUPL, Version 1.2 or – as soon they will be approved by the European Commission - subsequent
* versions of the EUPL (the "Licence");
diff --git a/smp-resource-extensions/oasis-smp-spi/src/main/java/eu/europa/ec/smp/spi/handler/AbstractOasisSMPHandler.java b/smp-resource-extensions/oasis-smp-spi/src/main/java/eu/europa/ec/smp/spi/handler/AbstractOasisSMPHandler.java
index 5248907f808613d04caf9baf79f30395d656338b..71b9f777916e499062fa7da7c6a88d67e63b4d4d 100644
--- a/smp-resource-extensions/oasis-smp-spi/src/main/java/eu/europa/ec/smp/spi/handler/AbstractOasisSMPHandler.java
+++ b/smp-resource-extensions/oasis-smp-spi/src/main/java/eu/europa/ec/smp/spi/handler/AbstractOasisSMPHandler.java
@@ -2,7 +2,7 @@
* #START_LICENSE#
* oasis-smp-spi
* %%
- * Copyright (C) 2017 - 2023 European Commission | eDelivery | DomiSMP
+ * Copyright (C) 2017 - 2024 European Commission | eDelivery | DomiSMP
* %%
* Licensed under the EUPL, Version 1.2 or – as soon they will be approved by the European Commission - subsequent
* versions of the EUPL (the "Licence");
diff --git a/smp-resource-extensions/oasis-smp-spi/src/main/java/eu/europa/ec/smp/spi/handler/OasisSMPResource10Handler.java b/smp-resource-extensions/oasis-smp-spi/src/main/java/eu/europa/ec/smp/spi/handler/OasisSMPResource10Handler.java
index a2fb0a7595626d806377a6855a44f464d799bd44..12f0295c294fa55383e534db11f46278729da730 100644
--- a/smp-resource-extensions/oasis-smp-spi/src/main/java/eu/europa/ec/smp/spi/handler/OasisSMPResource10Handler.java
+++ b/smp-resource-extensions/oasis-smp-spi/src/main/java/eu/europa/ec/smp/spi/handler/OasisSMPResource10Handler.java
@@ -2,7 +2,7 @@
* #START_LICENSE#
* oasis-smp-spi
* %%
- * Copyright (C) 2017 - 2023 European Commission | eDelivery | DomiSMP
+ * Copyright (C) 2017 - 2024 European Commission | eDelivery | DomiSMP
* %%
* Licensed under the EUPL, Version 1.2 or – as soon they will be approved by the European Commission - subsequent
* versions of the EUPL (the "Licence");
diff --git a/smp-resource-extensions/oasis-smp-spi/src/main/java/eu/europa/ec/smp/spi/handler/OasisSMPResource20Handler.java b/smp-resource-extensions/oasis-smp-spi/src/main/java/eu/europa/ec/smp/spi/handler/OasisSMPResource20Handler.java
index ef7ebbf251afc7ea532db637e753956d32daba8b..f224bbf0ca75ae6c292731bcd7b3d91fc91894aa 100644
--- a/smp-resource-extensions/oasis-smp-spi/src/main/java/eu/europa/ec/smp/spi/handler/OasisSMPResource20Handler.java
+++ b/smp-resource-extensions/oasis-smp-spi/src/main/java/eu/europa/ec/smp/spi/handler/OasisSMPResource20Handler.java
@@ -2,7 +2,7 @@
* #START_LICENSE#
* oasis-smp-spi
* %%
- * Copyright (C) 2017 - 2023 European Commission | eDelivery | DomiSMP
+ * Copyright (C) 2017 - 2024 European Commission | eDelivery | DomiSMP
* %%
* Licensed under the EUPL, Version 1.2 or – as soon they will be approved by the European Commission - subsequent
* versions of the EUPL (the "Licence");
diff --git a/smp-resource-extensions/oasis-smp-spi/src/main/java/eu/europa/ec/smp/spi/handler/OasisSMPSubresource10Handler.java b/smp-resource-extensions/oasis-smp-spi/src/main/java/eu/europa/ec/smp/spi/handler/OasisSMPSubresource10Handler.java
index 4fb7b1a066c32f85b35ac8fff72151f6a7c62c55..84bb992af191e820235c3e5a9601afffaf24aa10 100644
--- a/smp-resource-extensions/oasis-smp-spi/src/main/java/eu/europa/ec/smp/spi/handler/OasisSMPSubresource10Handler.java
+++ b/smp-resource-extensions/oasis-smp-spi/src/main/java/eu/europa/ec/smp/spi/handler/OasisSMPSubresource10Handler.java
@@ -2,7 +2,7 @@
* #START_LICENSE#
* oasis-smp-spi
* %%
- * Copyright (C) 2017 - 2023 European Commission | eDelivery | DomiSMP
+ * Copyright (C) 2017 - 2024 European Commission | eDelivery | DomiSMP
* %%
* Licensed under the EUPL, Version 1.2 or – as soon they will be approved by the European Commission - subsequent
* versions of the EUPL (the "Licence");
@@ -39,12 +39,6 @@ import org.slf4j.LoggerFactory;
import org.springframework.stereotype.Component;
import org.springframework.util.StreamUtils;
import org.w3c.dom.Document;
-import org.w3c.dom.Node;
-import org.xml.sax.SAXException;
-
-import javax.xml.parsers.DocumentBuilder;
-import javax.xml.parsers.DocumentBuilderFactory;
-import javax.xml.parsers.ParserConfigurationException;
import javax.xml.transform.TransformerException;
import java.io.BufferedInputStream;
import java.io.ByteArrayInputStream;
@@ -131,7 +125,7 @@ public class OasisSMPSubresource10Handler extends AbstractOasisSMPHandler {
Document docEnvelopedMetadata;
try {
byte[] bytearray = readFromInputStream(resourceData.getResourceInputStream());
- docEnvelopedMetadata = toSignedServiceMetadataDocument(bytearray);
+ docEnvelopedMetadata = DomUtils.toSignedSubresource10Document(bytearray);
} catch (IOException e) {
throw new ResourceException(PARSE_ERROR, "Can not marshal extension for service group: ["
+ resourceIdentifier + "]. Error: " + ExceptionUtils.getRootCauseMessage(e), e);
@@ -200,28 +194,4 @@ public class OasisSMPSubresource10Handler extends AbstractOasisSMPHandler {
serviceMetadataValidator.validate(identifier, documentIdentifier, subresource);
}
- public static Document toSignedServiceMetadataDocument(byte[] serviceMetadataXml) throws ResourceException {
- try {
- Document docServiceMetadata = parse(serviceMetadataXml);
- Document root = parse(DOC_SIGNED_SERVICE_METADATA_EMPTY.getBytes());
- Node imported = root.importNode(docServiceMetadata.getDocumentElement(), true);
- root.getDocumentElement().appendChild(imported);
- return root;
- } catch (ParserConfigurationException | SAXException | IOException ex) {
- throw new ResourceException(INVALID_RESOURCE, "Invalid Signed serviceMetadataXml with error: " + ExceptionUtils.getRootCauseMessage(ex), ex);
- }
- }
-
- private static Document parse(byte[] serviceMetadataXml) throws SAXException, IOException, ParserConfigurationException {
- InputStream inputStream = new ByteArrayInputStream(serviceMetadataXml);
- return getDocumentBuilder().parse(inputStream);
- }
-
- private static DocumentBuilder getDocumentBuilder() throws ParserConfigurationException {
- DocumentBuilderFactory dbf = DocumentBuilderFactory.newInstance();
- dbf.setNamespaceAware(true);
- dbf.setFeature(PARSER_DISALLOW_DTD_PARSING_FEATURE, true);
- return dbf.newDocumentBuilder();
- }
-
}
diff --git a/smp-resource-extensions/oasis-smp-spi/src/main/java/eu/europa/ec/smp/spi/handler/OasisSMPSubresource20Handler.java b/smp-resource-extensions/oasis-smp-spi/src/main/java/eu/europa/ec/smp/spi/handler/OasisSMPSubresource20Handler.java
index 72918072b12c05765099647b2df4836cd8af88a5..f9d4ea7727245d93e686a68d594785a1dc180df4 100644
--- a/smp-resource-extensions/oasis-smp-spi/src/main/java/eu/europa/ec/smp/spi/handler/OasisSMPSubresource20Handler.java
+++ b/smp-resource-extensions/oasis-smp-spi/src/main/java/eu/europa/ec/smp/spi/handler/OasisSMPSubresource20Handler.java
@@ -2,7 +2,7 @@
* #START_LICENSE#
* oasis-smp-spi
* %%
- * Copyright (C) 2017 - 2023 European Commission | eDelivery | DomiSMP
+ * Copyright (C) 2017 - 2024 European Commission | eDelivery | DomiSMP
* %%
* Licensed under the EUPL, Version 1.2 or – as soon they will be approved by the European Commission - subsequent
* versions of the EUPL (the "Licence");
diff --git a/smp-resource-extensions/oasis-smp-spi/src/main/java/eu/europa/ec/smp/spi/validation/Subresource10Validator.java b/smp-resource-extensions/oasis-smp-spi/src/main/java/eu/europa/ec/smp/spi/validation/Subresource10Validator.java
index 32f35f668a8693744c4de0aa68c2cfca0ad3b05a..524e4ce9cba2c5807aedacc1a9db9dff87c440f7 100644
--- a/smp-resource-extensions/oasis-smp-spi/src/main/java/eu/europa/ec/smp/spi/validation/Subresource10Validator.java
+++ b/smp-resource-extensions/oasis-smp-spi/src/main/java/eu/europa/ec/smp/spi/validation/Subresource10Validator.java
@@ -2,7 +2,7 @@
* #START_LICENSE#
* smp-webapp
* %%
- * Copyright (C) 2017 - 2023 European Commission | eDelivery | DomiSMP
+ * Copyright (C) 2017 - 2024 European Commission | eDelivery | DomiSMP
* %%
* Licensed under the EUPL, Version 1.2 or – as soon they will be approved by the European Commission - subsequent
* versions of the EUPL (the "Licence");
diff --git a/smp-resource-extensions/oasis-smp-spi/src/main/java/eu/europa/ec/smp/spi/validation/Subresource20Validator.java b/smp-resource-extensions/oasis-smp-spi/src/main/java/eu/europa/ec/smp/spi/validation/Subresource20Validator.java
index ae18e49bb13e37232a1e8ffccb8a0b87f4975c57..d6457aa6c27bd9383c7be8efa68255da0c8c458d 100644
--- a/smp-resource-extensions/oasis-smp-spi/src/main/java/eu/europa/ec/smp/spi/validation/Subresource20Validator.java
+++ b/smp-resource-extensions/oasis-smp-spi/src/main/java/eu/europa/ec/smp/spi/validation/Subresource20Validator.java
@@ -2,7 +2,7 @@
* #START_LICENSE#
* smp-webapp
* %%
- * Copyright (C) 2017 - 2023 European Commission | eDelivery | DomiSMP
+ * Copyright (C) 2017 - 2024 European Commission | eDelivery | DomiSMP
* %%
* Licensed under the EUPL, Version 1.2 or – as soon they will be approved by the European Commission - subsequent
* versions of the EUPL (the "Licence");
diff --git a/smp-resource-extensions/oasis-smp-spi/src/test/java/eu/europa/ec/smp/spi/OasisSMPExtensionTest.java b/smp-resource-extensions/oasis-smp-spi/src/test/java/eu/europa/ec/smp/spi/OasisSMPExtensionTest.java
index 938f103462f09e52b8097c88121ccfb697e15f4f..9c85293aea5bdf3207aaa5c6dc72dab6d9afb8d4 100644
--- a/smp-resource-extensions/oasis-smp-spi/src/test/java/eu/europa/ec/smp/spi/OasisSMPExtensionTest.java
+++ b/smp-resource-extensions/oasis-smp-spi/src/test/java/eu/europa/ec/smp/spi/OasisSMPExtensionTest.java
@@ -2,7 +2,7 @@
* #START_LICENSE#
* oasis-smp-spi
* %%
- * Copyright (C) 2017 - 2023 European Commission | eDelivery | DomiSMP
+ * Copyright (C) 2017 - 2024 European Commission | eDelivery | DomiSMP
* %%
* Licensed under the EUPL, Version 1.2 or – as soon they will be approved by the European Commission - subsequent
* versions of the EUPL (the "Licence");
diff --git a/smp-resource-extensions/oasis-smp-spi/src/test/java/eu/europa/ec/smp/spi/converter/ResourceConverterTest.java b/smp-resource-extensions/oasis-smp-spi/src/test/java/eu/europa/ec/smp/spi/converter/ResourceConverterTest.java
index ec1879d365bf52f5b51e0ff5870f9a2d5386cd7e..4a8532b1768fb6e24e61a0e476656ef7942d2877 100644
--- a/smp-resource-extensions/oasis-smp-spi/src/test/java/eu/europa/ec/smp/spi/converter/ResourceConverterTest.java
+++ b/smp-resource-extensions/oasis-smp-spi/src/test/java/eu/europa/ec/smp/spi/converter/ResourceConverterTest.java
@@ -2,7 +2,7 @@
* #START_LICENSE#
* smp-webapp
* %%
- * Copyright (C) 2017 - 2023 European Commission | eDelivery | DomiSMP
+ * Copyright (C) 2017 - 2024 European Commission | eDelivery | DomiSMP
* %%
* Licensed under the EUPL, Version 1.2 or – as soon they will be approved by the European Commission - subsequent
* versions of the EUPL (the "Licence");
diff --git a/smp-resource-extensions/oasis-smp-spi/src/test/java/eu/europa/ec/smp/spi/converter/SubresourceConverterTest.java b/smp-resource-extensions/oasis-smp-spi/src/test/java/eu/europa/ec/smp/spi/converter/SubresourceConverterTest.java
index 8fe23aaa6fa7819537b22024607030ae1a018e4a..f9e711e8898c1512e603d7b350066e07be78daf1 100644
--- a/smp-resource-extensions/oasis-smp-spi/src/test/java/eu/europa/ec/smp/spi/converter/SubresourceConverterTest.java
+++ b/smp-resource-extensions/oasis-smp-spi/src/test/java/eu/europa/ec/smp/spi/converter/SubresourceConverterTest.java
@@ -2,7 +2,7 @@
* #START_LICENSE#
* smp-webapp
* %%
- * Copyright (C) 2017 - 2023 European Commission | eDelivery | DomiSMP
+ * Copyright (C) 2017 - 2024 European Commission | eDelivery | DomiSMP
* %%
* Licensed under the EUPL, Version 1.2 or – as soon they will be approved by the European Commission - subsequent
* versions of the EUPL (the "Licence");
diff --git a/smp-resource-extensions/oasis-smp-spi/src/test/java/eu/europa/ec/smp/spi/def/OasisSMPResource10Test.java b/smp-resource-extensions/oasis-smp-spi/src/test/java/eu/europa/ec/smp/spi/def/OasisSMPResource10Test.java
index 569518040cc37d30192fcc98ff55c42a9e5cd5ab..7fd5483679d9f49a19ec24f777681b47d9ca2ee5 100644
--- a/smp-resource-extensions/oasis-smp-spi/src/test/java/eu/europa/ec/smp/spi/def/OasisSMPResource10Test.java
+++ b/smp-resource-extensions/oasis-smp-spi/src/test/java/eu/europa/ec/smp/spi/def/OasisSMPResource10Test.java
@@ -2,7 +2,7 @@
* #START_LICENSE#
* oasis-smp-spi
* %%
- * Copyright (C) 2017 - 2023 European Commission | eDelivery | DomiSMP
+ * Copyright (C) 2017 - 2024 European Commission | eDelivery | DomiSMP
* %%
* Licensed under the EUPL, Version 1.2 or – as soon they will be approved by the European Commission - subsequent
* versions of the EUPL (the "Licence");
diff --git a/smp-resource-extensions/oasis-smp-spi/src/test/java/eu/europa/ec/smp/spi/def/OasisSMPResource20Test.java b/smp-resource-extensions/oasis-smp-spi/src/test/java/eu/europa/ec/smp/spi/def/OasisSMPResource20Test.java
index 86a4a547726e55096683ec8115d8e9ca21bb2e22..74941484bbbb411ba676e7997c0f9214f8b75410 100644
--- a/smp-resource-extensions/oasis-smp-spi/src/test/java/eu/europa/ec/smp/spi/def/OasisSMPResource20Test.java
+++ b/smp-resource-extensions/oasis-smp-spi/src/test/java/eu/europa/ec/smp/spi/def/OasisSMPResource20Test.java
@@ -2,7 +2,7 @@
* #START_LICENSE#
* oasis-smp-spi
* %%
- * Copyright (C) 2017 - 2023 European Commission | eDelivery | DomiSMP
+ * Copyright (C) 2017 - 2024 European Commission | eDelivery | DomiSMP
* %%
* Licensed under the EUPL, Version 1.2 or – as soon they will be approved by the European Commission - subsequent
* versions of the EUPL (the "Licence");
diff --git a/smp-resource-extensions/oasis-smp-spi/src/test/java/eu/europa/ec/smp/spi/def/OasisSMPSubresource10Test.java b/smp-resource-extensions/oasis-smp-spi/src/test/java/eu/europa/ec/smp/spi/def/OasisSMPSubresource10Test.java
index 02487fd7bdc74aac4624f71f0cdcb596e5713016..03a5e1e0104a6659df8c8e71a60fba0ff0e9d697 100644
--- a/smp-resource-extensions/oasis-smp-spi/src/test/java/eu/europa/ec/smp/spi/def/OasisSMPSubresource10Test.java
+++ b/smp-resource-extensions/oasis-smp-spi/src/test/java/eu/europa/ec/smp/spi/def/OasisSMPSubresource10Test.java
@@ -2,7 +2,7 @@
* #START_LICENSE#
* oasis-smp-spi
* %%
- * Copyright (C) 2017 - 2023 European Commission | eDelivery | DomiSMP
+ * Copyright (C) 2017 - 2024 European Commission | eDelivery | DomiSMP
* %%
* Licensed under the EUPL, Version 1.2 or – as soon they will be approved by the European Commission - subsequent
* versions of the EUPL (the "Licence");
diff --git a/smp-resource-extensions/oasis-smp-spi/src/test/java/eu/europa/ec/smp/spi/def/OasisSMPSubresource20Test.java b/smp-resource-extensions/oasis-smp-spi/src/test/java/eu/europa/ec/smp/spi/def/OasisSMPSubresource20Test.java
index a993a7a078de9214ec69bc2960199fd56cbf9051..19c14d2c94df2a7ef43a590fe884c58ff321579a 100644
--- a/smp-resource-extensions/oasis-smp-spi/src/test/java/eu/europa/ec/smp/spi/def/OasisSMPSubresource20Test.java
+++ b/smp-resource-extensions/oasis-smp-spi/src/test/java/eu/europa/ec/smp/spi/def/OasisSMPSubresource20Test.java
@@ -2,7 +2,7 @@
* #START_LICENSE#
* oasis-smp-spi
* %%
- * Copyright (C) 2017 - 2023 European Commission | eDelivery | DomiSMP
+ * Copyright (C) 2017 - 2024 European Commission | eDelivery | DomiSMP
* %%
* Licensed under the EUPL, Version 1.2 or – as soon they will be approved by the European Commission - subsequent
* versions of the EUPL (the "Licence");
diff --git a/smp-resource-extensions/oasis-smp-spi/src/test/java/eu/europa/ec/smp/spi/handler/AbstractHandlerTest.java b/smp-resource-extensions/oasis-smp-spi/src/test/java/eu/europa/ec/smp/spi/handler/AbstractHandlerTest.java
index 5410843959f436a3d16f3e809470639f4dbb8cf1..6bbfc1fe6715cd3a848e285f31a4f92a68363408 100644
--- a/smp-resource-extensions/oasis-smp-spi/src/test/java/eu/europa/ec/smp/spi/handler/AbstractHandlerTest.java
+++ b/smp-resource-extensions/oasis-smp-spi/src/test/java/eu/europa/ec/smp/spi/handler/AbstractHandlerTest.java
@@ -2,7 +2,7 @@
* #START_LICENSE#
* oasis-smp-spi
* %%
- * Copyright (C) 2017 - 2023 European Commission | eDelivery | DomiSMP
+ * Copyright (C) 2017 - 2024 European Commission | eDelivery | DomiSMP
* %%
* Licensed under the EUPL, Version 1.2 or – as soon they will be approved by the European Commission - subsequent
* versions of the EUPL (the "Licence");
diff --git a/smp-resource-extensions/oasis-smp-spi/src/test/java/eu/europa/ec/smp/spi/handler/OasisSMPResource10HandlerTest.java b/smp-resource-extensions/oasis-smp-spi/src/test/java/eu/europa/ec/smp/spi/handler/OasisSMPResource10HandlerTest.java
index 9f61819f30de2f263beba01eeaeebfbd1d4733dd..6fb676a0945af75741f619ede2fdf91be05a812c 100644
--- a/smp-resource-extensions/oasis-smp-spi/src/test/java/eu/europa/ec/smp/spi/handler/OasisSMPResource10HandlerTest.java
+++ b/smp-resource-extensions/oasis-smp-spi/src/test/java/eu/europa/ec/smp/spi/handler/OasisSMPResource10HandlerTest.java
@@ -2,7 +2,7 @@
* #START_LICENSE#
* oasis-smp-spi
* %%
- * Copyright (C) 2017 - 2023 European Commission | eDelivery | DomiSMP
+ * Copyright (C) 2017 - 2024 European Commission | eDelivery | DomiSMP
* %%
* Licensed under the EUPL, Version 1.2 or – as soon they will be approved by the European Commission - subsequent
* versions of the EUPL (the "Licence");
diff --git a/smp-resource-extensions/oasis-smp-spi/src/test/java/eu/europa/ec/smp/spi/handler/OasisSMPResource20HandlerTest.java b/smp-resource-extensions/oasis-smp-spi/src/test/java/eu/europa/ec/smp/spi/handler/OasisSMPResource20HandlerTest.java
index 982f7bf3e6edf3f5d510fd6f54d9c8b953ea161d..f3e2c177d9dde41061bde04293cbe9eb8ba6757a 100644
--- a/smp-resource-extensions/oasis-smp-spi/src/test/java/eu/europa/ec/smp/spi/handler/OasisSMPResource20HandlerTest.java
+++ b/smp-resource-extensions/oasis-smp-spi/src/test/java/eu/europa/ec/smp/spi/handler/OasisSMPResource20HandlerTest.java
@@ -2,7 +2,7 @@
* #START_LICENSE#
* oasis-smp-spi
* %%
- * Copyright (C) 2017 - 2023 European Commission | eDelivery | DomiSMP
+ * Copyright (C) 2017 - 2024 European Commission | eDelivery | DomiSMP
* %%
* Licensed under the EUPL, Version 1.2 or – as soon they will be approved by the European Commission - subsequent
* versions of the EUPL (the "Licence");
diff --git a/smp-resource-extensions/oasis-smp-spi/src/test/java/eu/europa/ec/smp/spi/handler/OasisSMPSubresource10HandlerTest.java b/smp-resource-extensions/oasis-smp-spi/src/test/java/eu/europa/ec/smp/spi/handler/OasisSMPSubresource10HandlerTest.java
index e7b0bf97b5dd08efd1229c35278905b223837f8a..958f762c122bebcb8c5d5c2ef20df36b3dfc7980 100644
--- a/smp-resource-extensions/oasis-smp-spi/src/test/java/eu/europa/ec/smp/spi/handler/OasisSMPSubresource10HandlerTest.java
+++ b/smp-resource-extensions/oasis-smp-spi/src/test/java/eu/europa/ec/smp/spi/handler/OasisSMPSubresource10HandlerTest.java
@@ -2,7 +2,7 @@
* #START_LICENSE#
* oasis-smp-spi
* %%
- * Copyright (C) 2017 - 2023 European Commission | eDelivery | DomiSMP
+ * Copyright (C) 2017 - 2024 European Commission | eDelivery | DomiSMP
* %%
* Licensed under the EUPL, Version 1.2 or – as soon they will be approved by the European Commission - subsequent
* versions of the EUPL (the "Licence");
diff --git a/smp-resource-extensions/oasis-smp-spi/src/test/java/eu/europa/ec/smp/spi/handler/OasisSMPSubresource20HandlerTest.java b/smp-resource-extensions/oasis-smp-spi/src/test/java/eu/europa/ec/smp/spi/handler/OasisSMPSubresource20HandlerTest.java
index 8c43587af5885e8df0d6da25d8c7f01d861be661..94d5e41fbcf173d1dc9a68e20cdbb46a33e42652 100644
--- a/smp-resource-extensions/oasis-smp-spi/src/test/java/eu/europa/ec/smp/spi/handler/OasisSMPSubresource20HandlerTest.java
+++ b/smp-resource-extensions/oasis-smp-spi/src/test/java/eu/europa/ec/smp/spi/handler/OasisSMPSubresource20HandlerTest.java
@@ -2,7 +2,7 @@
* #START_LICENSE#
* oasis-smp-spi
* %%
- * Copyright (C) 2017 - 2023 European Commission | eDelivery | DomiSMP
+ * Copyright (C) 2017 - 2024 European Commission | eDelivery | DomiSMP
* %%
* Licensed under the EUPL, Version 1.2 or – as soon they will be approved by the European Commission - subsequent
* versions of the EUPL (the "Licence");
diff --git a/smp-resource-extensions/oasis-smp-spi/src/test/java/eu/europa/ec/smp/spi/testutils/XmlTestUtils.java b/smp-resource-extensions/oasis-smp-spi/src/test/java/eu/europa/ec/smp/spi/testutils/XmlTestUtils.java
index 99d91c8135395b0346525d95571eff965e596d51..cf2bd4535284d1550c35182e60563d8090d11029 100644
--- a/smp-resource-extensions/oasis-smp-spi/src/test/java/eu/europa/ec/smp/spi/testutils/XmlTestUtils.java
+++ b/smp-resource-extensions/oasis-smp-spi/src/test/java/eu/europa/ec/smp/spi/testutils/XmlTestUtils.java
@@ -2,7 +2,7 @@
* #START_LICENSE#
* smp-webapp
* %%
- * Copyright (C) 2017 - 2023 European Commission | eDelivery | DomiSMP
+ * Copyright (C) 2017 - 2024 European Commission | eDelivery | DomiSMP
* %%
* Licensed under the EUPL, Version 1.2 or – as soon they will be approved by the European Commission - subsequent
* versions of the EUPL (the "Licence");
diff --git a/smp-resource-extensions/oasis-smp-spi/src/test/resources/examples/extensions/extensionCustom.xml b/smp-resource-extensions/oasis-smp-spi/src/test/resources/examples/extensions/extensionCustom.xml
index 39d5178fe5c185f3b6cea3de578fddfea4697ac6..8e85893cfde90a65433dfd37d6294f01ff70843d 100644
--- a/smp-resource-extensions/oasis-smp-spi/src/test/resources/examples/extensions/extensionCustom.xml
+++ b/smp-resource-extensions/oasis-smp-spi/src/test/resources/examples/extensions/extensionCustom.xml
@@ -2,7 +2,7 @@
#START_LICENSE#
oasis-smp-spi
%%
- Copyright (C) 2017 - 2023 European Commission | eDelivery | DomiSMP
+ Copyright (C) 2017 - 2024 European Commission | eDelivery | DomiSMP
%%
Licensed under the EUPL, Version 1.2 or – as soon they will be approved by the European Commission - subsequent
versions of the EUPL (the "Licence");
diff --git a/smp-resource-extensions/oasis-smp-spi/src/test/resources/examples/extensions/extensionCustomText.xml b/smp-resource-extensions/oasis-smp-spi/src/test/resources/examples/extensions/extensionCustomText.xml
index 1461d0f7065e79dcf0776f69395c53ec07d8fa7d..9464d0b6a3931ace53751d0eb1c6bfcbe3923b03 100644
--- a/smp-resource-extensions/oasis-smp-spi/src/test/resources/examples/extensions/extensionCustomText.xml
+++ b/smp-resource-extensions/oasis-smp-spi/src/test/resources/examples/extensions/extensionCustomText.xml
@@ -2,7 +2,7 @@
#START_LICENSE#
oasis-smp-spi
%%
- Copyright (C) 2017 - 2023 European Commission | eDelivery | DomiSMP
+ Copyright (C) 2017 - 2024 European Commission | eDelivery | DomiSMP
%%
Licensed under the EUPL, Version 1.2 or – as soon they will be approved by the European Commission - subsequent
versions of the EUPL (the "Licence");
diff --git a/smp-resource-extensions/oasis-smp-spi/src/test/resources/examples/extensions/extensionInvalid.xml b/smp-resource-extensions/oasis-smp-spi/src/test/resources/examples/extensions/extensionInvalid.xml
index 645285c4d8d868a61b7e5a3e2c12449c593ed436..8217dc61465507b782f6baf7635f07a8aed4e538 100644
--- a/smp-resource-extensions/oasis-smp-spi/src/test/resources/examples/extensions/extensionInvalid.xml
+++ b/smp-resource-extensions/oasis-smp-spi/src/test/resources/examples/extensions/extensionInvalid.xml
@@ -2,7 +2,7 @@
#START_LICENSE#
oasis-smp-spi
%%
- Copyright (C) 2017 - 2023 European Commission | eDelivery | DomiSMP
+ Copyright (C) 2017 - 2024 European Commission | eDelivery | DomiSMP
%%
Licensed under the EUPL, Version 1.2 or – as soon they will be approved by the European Commission - subsequent
versions of the EUPL (the "Licence");
diff --git a/smp-resource-extensions/oasis-smp-spi/src/test/resources/examples/extensions/extensionMarshal.xml b/smp-resource-extensions/oasis-smp-spi/src/test/resources/examples/extensions/extensionMarshal.xml
index 77bacfddd1650ec6de0ee5d78273862030d174f3..6c93623bf30c2218d32e49b58df92e9745137e56 100644
--- a/smp-resource-extensions/oasis-smp-spi/src/test/resources/examples/extensions/extensionMarshal.xml
+++ b/smp-resource-extensions/oasis-smp-spi/src/test/resources/examples/extensions/extensionMarshal.xml
@@ -2,7 +2,7 @@
#START_LICENSE#
oasis-smp-spi
%%
- Copyright (C) 2017 - 2023 European Commission | eDelivery | DomiSMP
+ Copyright (C) 2017 - 2024 European Commission | eDelivery | DomiSMP
%%
Licensed under the EUPL, Version 1.2 or – as soon they will be approved by the European Commission - subsequent
versions of the EUPL (the "Licence");
diff --git a/smp-resource-extensions/oasis-smp-spi/src/test/resources/examples/extensions/extensionMarshalMore.xml b/smp-resource-extensions/oasis-smp-spi/src/test/resources/examples/extensions/extensionMarshalMore.xml
index 764a6a5b390c6f8146a4d012e515ee06478f3a3d..03291dd631bfb085e68f8cf09697168f8ff60592 100644
--- a/smp-resource-extensions/oasis-smp-spi/src/test/resources/examples/extensions/extensionMarshalMore.xml
+++ b/smp-resource-extensions/oasis-smp-spi/src/test/resources/examples/extensions/extensionMarshalMore.xml
@@ -2,7 +2,7 @@
#START_LICENSE#
oasis-smp-spi
%%
- Copyright (C) 2017 - 2023 European Commission | eDelivery | DomiSMP
+ Copyright (C) 2017 - 2024 European Commission | eDelivery | DomiSMP
%%
Licensed under the EUPL, Version 1.2 or – as soon they will be approved by the European Commission - subsequent
versions of the EUPL (the "Licence");
diff --git a/smp-resource-extensions/oasis-smp-spi/src/test/resources/examples/extensions/extensionValidMultiple.xml b/smp-resource-extensions/oasis-smp-spi/src/test/resources/examples/extensions/extensionValidMultiple.xml
index 973a8dd9b0acc320c8f07b453640447074cae89d..56043451286b35557eab482bdb1efe41b16bfbe0 100644
--- a/smp-resource-extensions/oasis-smp-spi/src/test/resources/examples/extensions/extensionValidMultiple.xml
+++ b/smp-resource-extensions/oasis-smp-spi/src/test/resources/examples/extensions/extensionValidMultiple.xml
@@ -2,7 +2,7 @@
#START_LICENSE#
oasis-smp-spi
%%
- Copyright (C) 2017 - 2023 European Commission | eDelivery | DomiSMP
+ Copyright (C) 2017 - 2024 European Commission | eDelivery | DomiSMP
%%
Licensed under the EUPL, Version 1.2 or – as soon they will be approved by the European Commission - subsequent
versions of the EUPL (the "Licence");
diff --git a/smp-resource-extensions/oasis-smp-spi/src/test/resources/examples/extensions/extensionValidOne.xml b/smp-resource-extensions/oasis-smp-spi/src/test/resources/examples/extensions/extensionValidOne.xml
index 9c0bfbb286c4ab4577fd89755edfb7ea3f2852d4..15cea2d3d08393c7747ab7dd8543c4dd0d67e48a 100644
--- a/smp-resource-extensions/oasis-smp-spi/src/test/resources/examples/extensions/extensionValidOne.xml
+++ b/smp-resource-extensions/oasis-smp-spi/src/test/resources/examples/extensions/extensionValidOne.xml
@@ -2,7 +2,7 @@
#START_LICENSE#
oasis-smp-spi
%%
- Copyright (C) 2017 - 2023 European Commission | eDelivery | DomiSMP
+ Copyright (C) 2017 - 2024 European Commission | eDelivery | DomiSMP
%%
Licensed under the EUPL, Version 1.2 or – as soon they will be approved by the European Commission - subsequent
versions of the EUPL (the "Licence");
diff --git a/smp-resource-extensions/oasis-smp-spi/src/test/resources/examples/oasis-smp-1.0/ResourceInvalidScheme.xml b/smp-resource-extensions/oasis-smp-spi/src/test/resources/examples/oasis-smp-1.0/ResourceInvalidScheme.xml
index be5b47d40a45ba22e729f3a99b1ddbc842559063..cae1f9856e55a00a2176332c214bf004f8179b36 100644
--- a/smp-resource-extensions/oasis-smp-spi/src/test/resources/examples/oasis-smp-1.0/ResourceInvalidScheme.xml
+++ b/smp-resource-extensions/oasis-smp-spi/src/test/resources/examples/oasis-smp-1.0/ResourceInvalidScheme.xml
@@ -3,7 +3,7 @@
#START_LICENSE#
oasis-smp-spi
%%
- Copyright (C) 2017 - 2023 European Commission | eDelivery | DomiSMP
+ Copyright (C) 2017 - 2024 European Commission | eDelivery | DomiSMP
%%
Licensed under the EUPL, Version 1.2 or – as soon they will be approved by the European Commission - subsequent
versions of the EUPL (the "Licence");
diff --git a/smp-resource-extensions/oasis-smp-spi/src/test/resources/examples/oasis-smp-1.0/ResourceOK.xml b/smp-resource-extensions/oasis-smp-spi/src/test/resources/examples/oasis-smp-1.0/ResourceOK.xml
index f7f2835aeabd499402d19571867882fbac6f7383..63512b63e3d64f376f7e8d47c22e7eafb829743e 100644
--- a/smp-resource-extensions/oasis-smp-spi/src/test/resources/examples/oasis-smp-1.0/ResourceOK.xml
+++ b/smp-resource-extensions/oasis-smp-spi/src/test/resources/examples/oasis-smp-1.0/ResourceOK.xml
@@ -3,7 +3,7 @@
#START_LICENSE#
oasis-smp-spi
%%
- Copyright (C) 2017 - 2023 European Commission | eDelivery | DomiSMP
+ Copyright (C) 2017 - 2024 European Commission | eDelivery | DomiSMP
%%
Licensed under the EUPL, Version 1.2 or – as soon they will be approved by the European Commission - subsequent
versions of the EUPL (the "Licence");
diff --git a/smp-resource-extensions/oasis-smp-spi/src/test/resources/examples/oasis-smp-1.0/ResourceWithDOCTYPE.xml b/smp-resource-extensions/oasis-smp-spi/src/test/resources/examples/oasis-smp-1.0/ResourceWithDOCTYPE.xml
index 93b19f1bd6377ed61bcaa46f1aa092e0121ee7c0..7adef0ce0e520fcac463985d0c8a2992874bd176 100644
--- a/smp-resource-extensions/oasis-smp-spi/src/test/resources/examples/oasis-smp-1.0/ResourceWithDOCTYPE.xml
+++ b/smp-resource-extensions/oasis-smp-spi/src/test/resources/examples/oasis-smp-1.0/ResourceWithDOCTYPE.xml
@@ -3,7 +3,7 @@
#START_LICENSE#
oasis-smp-spi
%%
- Copyright (C) 2017 - 2023 European Commission | eDelivery | DomiSMP
+ Copyright (C) 2017 - 2024 European Commission | eDelivery | DomiSMP
%%
Licensed under the EUPL, Version 1.2 or – as soon they will be approved by the European Commission - subsequent
versions of the EUPL (the "Licence");
diff --git a/smp-resource-extensions/oasis-smp-spi/src/test/resources/examples/oasis-smp-1.0/ResourceWithExtension.xml b/smp-resource-extensions/oasis-smp-spi/src/test/resources/examples/oasis-smp-1.0/ResourceWithExtension.xml
index 6e328c21cf8aacb9ed499d85101c869fec2a2aeb..a64474ede7cbce66c2cb01aac4825db3ba884f83 100644
--- a/smp-resource-extensions/oasis-smp-spi/src/test/resources/examples/oasis-smp-1.0/ResourceWithExtension.xml
+++ b/smp-resource-extensions/oasis-smp-spi/src/test/resources/examples/oasis-smp-1.0/ResourceWithExtension.xml
@@ -3,7 +3,7 @@
#START_LICENSE#
oasis-smp-spi
%%
- Copyright (C) 2017 - 2023 European Commission | eDelivery | DomiSMP
+ Copyright (C) 2017 - 2024 European Commission | eDelivery | DomiSMP
%%
Licensed under the EUPL, Version 1.2 or – as soon they will be approved by the European Commission - subsequent
versions of the EUPL (the "Licence");
diff --git a/smp-resource-extensions/oasis-smp-spi/src/test/resources/examples/oasis-smp-1.0/SubresourceMissingMandatoryFields.xml b/smp-resource-extensions/oasis-smp-spi/src/test/resources/examples/oasis-smp-1.0/SubresourceMissingMandatoryFields.xml
index 6df85f9c5f0ddadd4a4ba7a1a70d85c1d1aeaefd..9c4f3513e88f12fd0ca6029f48625c1405208192 100644
--- a/smp-resource-extensions/oasis-smp-spi/src/test/resources/examples/oasis-smp-1.0/SubresourceMissingMandatoryFields.xml
+++ b/smp-resource-extensions/oasis-smp-spi/src/test/resources/examples/oasis-smp-1.0/SubresourceMissingMandatoryFields.xml
@@ -3,7 +3,7 @@
#START_LICENSE#
oasis-smp-spi
%%
- Copyright (C) 2017 - 2023 European Commission | eDelivery | DomiSMP
+ Copyright (C) 2017 - 2024 European Commission | eDelivery | DomiSMP
%%
Licensed under the EUPL, Version 1.2 or – as soon they will be approved by the European Commission - subsequent
versions of the EUPL (the "Licence");
diff --git a/smp-resource-extensions/oasis-smp-spi/src/test/resources/examples/oasis-smp-1.0/SubresourceWithDOCTYPE.xml b/smp-resource-extensions/oasis-smp-spi/src/test/resources/examples/oasis-smp-1.0/SubresourceWithDOCTYPE.xml
index 23cc363bc679aad5d1ddc393c3c766567347ad24..20ae5b39c52ec17d4db4dabcd2b37db21c227847 100644
--- a/smp-resource-extensions/oasis-smp-spi/src/test/resources/examples/oasis-smp-1.0/SubresourceWithDOCTYPE.xml
+++ b/smp-resource-extensions/oasis-smp-spi/src/test/resources/examples/oasis-smp-1.0/SubresourceWithDOCTYPE.xml
@@ -3,7 +3,7 @@
#START_LICENSE#
oasis-smp-spi
%%
- Copyright (C) 2017 - 2023 European Commission | eDelivery | DomiSMP
+ Copyright (C) 2017 - 2024 European Commission | eDelivery | DomiSMP
%%
Licensed under the EUPL, Version 1.2 or – as soon they will be approved by the European Commission - subsequent
versions of the EUPL (the "Licence");
diff --git a/smp-resource-extensions/oasis-smp-spi/src/test/resources/examples/oasis-smp-1.0/SubresourceWithRedirect.xml b/smp-resource-extensions/oasis-smp-spi/src/test/resources/examples/oasis-smp-1.0/SubresourceWithRedirect.xml
index 561166189fd6ab2a389a2b31cf3056dc949cfcca..0f5d1a58a93daea9015caab687f381af13127273 100644
--- a/smp-resource-extensions/oasis-smp-spi/src/test/resources/examples/oasis-smp-1.0/SubresourceWithRedirect.xml
+++ b/smp-resource-extensions/oasis-smp-spi/src/test/resources/examples/oasis-smp-1.0/SubresourceWithRedirect.xml
@@ -3,7 +3,7 @@
#START_LICENSE#
oasis-smp-spi
%%
- Copyright (C) 2017 - 2023 European Commission | eDelivery | DomiSMP
+ Copyright (C) 2017 - 2024 European Commission | eDelivery | DomiSMP
%%
Licensed under the EUPL, Version 1.2 or – as soon they will be approved by the European Commission - subsequent
versions of the EUPL (the "Licence");
diff --git a/smp-resource-extensions/oasis-smp-spi/src/test/resources/examples/oasis-smp-1.0/SubresourceWithServiceInformationUtf8.xml b/smp-resource-extensions/oasis-smp-spi/src/test/resources/examples/oasis-smp-1.0/SubresourceWithServiceInformationUtf8.xml
index ddac75ab9927aff56a7f8613e9ee7564006505f3..a4e2363acf5d03708f2ecf8cbe36140d799932fb 100644
--- a/smp-resource-extensions/oasis-smp-spi/src/test/resources/examples/oasis-smp-1.0/SubresourceWithServiceInformationUtf8.xml
+++ b/smp-resource-extensions/oasis-smp-spi/src/test/resources/examples/oasis-smp-1.0/SubresourceWithServiceInformationUtf8.xml
@@ -3,7 +3,7 @@
#START_LICENSE#
oasis-smp-spi
%%
- Copyright (C) 2017 - 2023 European Commission | eDelivery | DomiSMP
+ Copyright (C) 2017 - 2024 European Commission | eDelivery | DomiSMP
%%
Licensed under the EUPL, Version 1.2 or – as soon they will be approved by the European Commission - subsequent
versions of the EUPL (the "Licence");
diff --git a/smp-resource-extensions/oasis-smp-spi/src/test/resources/examples/oasis-smp-1.0/SubresourceWithServiceOk.xml b/smp-resource-extensions/oasis-smp-spi/src/test/resources/examples/oasis-smp-1.0/SubresourceWithServiceOk.xml
index a0004b7a8aa40bf782f99e4105e6bd9305a73da0..82e9f1b079adf60066e6ee0a452d914e46e014fa 100644
--- a/smp-resource-extensions/oasis-smp-spi/src/test/resources/examples/oasis-smp-1.0/SubresourceWithServiceOk.xml
+++ b/smp-resource-extensions/oasis-smp-spi/src/test/resources/examples/oasis-smp-1.0/SubresourceWithServiceOk.xml
@@ -3,7 +3,7 @@
#START_LICENSE#
oasis-smp-spi
%%
- Copyright (C) 2017 - 2023 European Commission | eDelivery | DomiSMP
+ Copyright (C) 2017 - 2024 European Commission | eDelivery | DomiSMP
%%
Licensed under the EUPL, Version 1.2 or – as soon they will be approved by the European Commission - subsequent
versions of the EUPL (the "Licence");
diff --git a/smp-resource-extensions/oasis-smp-spi/src/test/resources/examples/oasis-smp-2.0/resource_unsigned_invalid_iso6523.xml b/smp-resource-extensions/oasis-smp-spi/src/test/resources/examples/oasis-smp-2.0/resource_unsigned_invalid_iso6523.xml
index b668b1b31a35d65397433fc216107871a640551c..c298c1af1da234e36251c7c0a0860a329dc53e44 100644
--- a/smp-resource-extensions/oasis-smp-spi/src/test/resources/examples/oasis-smp-2.0/resource_unsigned_invalid_iso6523.xml
+++ b/smp-resource-extensions/oasis-smp-spi/src/test/resources/examples/oasis-smp-2.0/resource_unsigned_invalid_iso6523.xml
@@ -3,7 +3,7 @@
#START_LICENSE#
oasis-smp-spi
%%
- Copyright (C) 2017 - 2023 European Commission | eDelivery | DomiSMP
+ Copyright (C) 2017 - 2024 European Commission | eDelivery | DomiSMP
%%
Licensed under the EUPL, Version 1.2 or – as soon they will be approved by the European Commission - subsequent
versions of the EUPL (the "Licence");
diff --git a/smp-resource-extensions/oasis-smp-spi/src/test/resources/examples/oasis-smp-2.0/resource_unsigned_invalid_iso6523_DTD.xml b/smp-resource-extensions/oasis-smp-spi/src/test/resources/examples/oasis-smp-2.0/resource_unsigned_invalid_iso6523_DTD.xml
index 64db5ea646ba9b0776dd9d67e866faa41b5ace6a..9a4fb3c18ffcc408c04ddbb89b658e6e9e3c551c 100644
--- a/smp-resource-extensions/oasis-smp-spi/src/test/resources/examples/oasis-smp-2.0/resource_unsigned_invalid_iso6523_DTD.xml
+++ b/smp-resource-extensions/oasis-smp-spi/src/test/resources/examples/oasis-smp-2.0/resource_unsigned_invalid_iso6523_DTD.xml
@@ -4,7 +4,7 @@
#START_LICENSE#
oasis-smp-spi
%%
- Copyright (C) 2017 - 2023 European Commission | eDelivery | DomiSMP
+ Copyright (C) 2017 - 2024 European Commission | eDelivery | DomiSMP
%%
Licensed under the EUPL, Version 1.2 or – as soon they will be approved by the European Commission - subsequent
versions of the EUPL (the "Licence");
diff --git a/smp-resource-extensions/oasis-smp-spi/src/test/resources/examples/oasis-smp-2.0/resource_unsigned_valid_iso6523-no-references.xml b/smp-resource-extensions/oasis-smp-spi/src/test/resources/examples/oasis-smp-2.0/resource_unsigned_valid_iso6523-no-references.xml
index bae149e452e22c0d827debaf0ab3e5b6a45650f0..cdfe1412c09a65c95df06cff74930b5ff6f000c3 100644
--- a/smp-resource-extensions/oasis-smp-spi/src/test/resources/examples/oasis-smp-2.0/resource_unsigned_valid_iso6523-no-references.xml
+++ b/smp-resource-extensions/oasis-smp-spi/src/test/resources/examples/oasis-smp-2.0/resource_unsigned_valid_iso6523-no-references.xml
@@ -3,7 +3,7 @@
#START_LICENSE#
oasis-smp-spi
%%
- Copyright (C) 2017 - 2023 European Commission | eDelivery | DomiSMP
+ Copyright (C) 2017 - 2024 European Commission | eDelivery | DomiSMP
%%
Licensed under the EUPL, Version 1.2 or – as soon they will be approved by the European Commission - subsequent
versions of the EUPL (the "Licence");
diff --git a/smp-resource-extensions/oasis-smp-spi/src/test/resources/examples/oasis-smp-2.0/resource_unsigned_valid_iso6523.xml b/smp-resource-extensions/oasis-smp-spi/src/test/resources/examples/oasis-smp-2.0/resource_unsigned_valid_iso6523.xml
index f0bc3396c4a954b03fefda285ebe47dc84809daf..2f95a513e817136357a7a2d0a57df77d933f3196 100644
--- a/smp-resource-extensions/oasis-smp-spi/src/test/resources/examples/oasis-smp-2.0/resource_unsigned_valid_iso6523.xml
+++ b/smp-resource-extensions/oasis-smp-spi/src/test/resources/examples/oasis-smp-2.0/resource_unsigned_valid_iso6523.xml
@@ -3,7 +3,7 @@
#START_LICENSE#
oasis-smp-spi
%%
- Copyright (C) 2017 - 2023 European Commission | eDelivery | DomiSMP
+ Copyright (C) 2017 - 2024 European Commission | eDelivery | DomiSMP
%%
Licensed under the EUPL, Version 1.2 or – as soon they will be approved by the European Commission - subsequent
versions of the EUPL (the "Licence");
diff --git a/smp-resource-extensions/oasis-smp-spi/src/test/resources/examples/oasis-smp-2.0/subresource_unsigned_invalid_iso6523.xml b/smp-resource-extensions/oasis-smp-spi/src/test/resources/examples/oasis-smp-2.0/subresource_unsigned_invalid_iso6523.xml
index 6a9fe9a9c99ce8f06332b2bbce8eca81e51090e9..d7597011574de73f90a60dedba6ec8bd304a2203 100644
--- a/smp-resource-extensions/oasis-smp-spi/src/test/resources/examples/oasis-smp-2.0/subresource_unsigned_invalid_iso6523.xml
+++ b/smp-resource-extensions/oasis-smp-spi/src/test/resources/examples/oasis-smp-2.0/subresource_unsigned_invalid_iso6523.xml
@@ -3,7 +3,7 @@
#START_LICENSE#
oasis-smp-spi
%%
- Copyright (C) 2017 - 2023 European Commission | eDelivery | DomiSMP
+ Copyright (C) 2017 - 2024 European Commission | eDelivery | DomiSMP
%%
Licensed under the EUPL, Version 1.2 or – as soon they will be approved by the European Commission - subsequent
versions of the EUPL (the "Licence");
diff --git a/smp-resource-extensions/oasis-smp-spi/src/test/resources/examples/oasis-smp-2.0/subresource_unsigned_invalid_iso6523_DTD.xml b/smp-resource-extensions/oasis-smp-spi/src/test/resources/examples/oasis-smp-2.0/subresource_unsigned_invalid_iso6523_DTD.xml
index af4c2d3d9615da74883bc18a3a16f815e719d84e..0d37cf3fc4e86cf93dcbdcf31f560ddc2c812955 100644
--- a/smp-resource-extensions/oasis-smp-spi/src/test/resources/examples/oasis-smp-2.0/subresource_unsigned_invalid_iso6523_DTD.xml
+++ b/smp-resource-extensions/oasis-smp-spi/src/test/resources/examples/oasis-smp-2.0/subresource_unsigned_invalid_iso6523_DTD.xml
@@ -3,7 +3,7 @@
#START_LICENSE#
oasis-smp-spi
%%
- Copyright (C) 2017 - 2023 European Commission | eDelivery | DomiSMP
+ Copyright (C) 2017 - 2024 European Commission | eDelivery | DomiSMP
%%
Licensed under the EUPL, Version 1.2 or – as soon they will be approved by the European Commission - subsequent
versions of the EUPL (the "Licence");
diff --git a/smp-resource-extensions/oasis-smp-spi/src/test/resources/examples/oasis-smp-2.0/subresource_unsigned_redirection_iso6523.xml b/smp-resource-extensions/oasis-smp-spi/src/test/resources/examples/oasis-smp-2.0/subresource_unsigned_redirection_iso6523.xml
index d48556d62102f1e6dcb9fe0381dccc3dd15c7b9f..474156894112daba274a74365fc6db6b83b4c79c 100644
--- a/smp-resource-extensions/oasis-smp-spi/src/test/resources/examples/oasis-smp-2.0/subresource_unsigned_redirection_iso6523.xml
+++ b/smp-resource-extensions/oasis-smp-spi/src/test/resources/examples/oasis-smp-2.0/subresource_unsigned_redirection_iso6523.xml
@@ -3,7 +3,7 @@
#START_LICENSE#
oasis-smp-spi
%%
- Copyright (C) 2017 - 2023 European Commission | eDelivery | DomiSMP
+ Copyright (C) 2017 - 2024 European Commission | eDelivery | DomiSMP
%%
Licensed under the EUPL, Version 1.2 or – as soon they will be approved by the European Commission - subsequent
versions of the EUPL (the "Licence");
diff --git a/smp-resource-extensions/oasis-smp-spi/src/test/resources/examples/oasis-smp-2.0/subresource_unsigned_valid_iso6523.xml b/smp-resource-extensions/oasis-smp-spi/src/test/resources/examples/oasis-smp-2.0/subresource_unsigned_valid_iso6523.xml
index 39c71872f991b5c93c5d0021750499596101829a..95e0562d841d0b4dbeb0a2e099f650b25c93b8db 100644
--- a/smp-resource-extensions/oasis-smp-spi/src/test/resources/examples/oasis-smp-2.0/subresource_unsigned_valid_iso6523.xml
+++ b/smp-resource-extensions/oasis-smp-spi/src/test/resources/examples/oasis-smp-2.0/subresource_unsigned_valid_iso6523.xml
@@ -3,7 +3,7 @@
#START_LICENSE#
oasis-smp-spi
%%
- Copyright (C) 2017 - 2023 European Commission | eDelivery | DomiSMP
+ Copyright (C) 2017 - 2024 European Commission | eDelivery | DomiSMP
%%
Licensed under the EUPL, Version 1.2 or – as soon they will be approved by the European Commission - subsequent
versions of the EUPL (the "Licence");
diff --git a/smp-resource-extensions/oasis-smp-spi/src/test/resources/examples/services/ResourcePoland.xml b/smp-resource-extensions/oasis-smp-spi/src/test/resources/examples/services/ResourcePoland.xml
index c884c4a48ae025367ea4d1f770ee5269b8b5d0e1..9e086479f47f225b62e339da202bea51c2493946 100644
--- a/smp-resource-extensions/oasis-smp-spi/src/test/resources/examples/services/ResourcePoland.xml
+++ b/smp-resource-extensions/oasis-smp-spi/src/test/resources/examples/services/ResourcePoland.xml
@@ -3,7 +3,7 @@
#START_LICENSE#
oasis-smp-spi
%%
- Copyright (C) 2017 - 2023 European Commission | eDelivery | DomiSMP
+ Copyright (C) 2017 - 2024 European Commission | eDelivery | DomiSMP
%%
Licensed under the EUPL, Version 1.2 or – as soon they will be approved by the European Commission - subsequent
versions of the EUPL (the "Licence");
diff --git a/smp-resource-extensions/oasis-smp-spi/src/test/resources/examples/services/ResourceTestSgId2.xml b/smp-resource-extensions/oasis-smp-spi/src/test/resources/examples/services/ResourceTestSgId2.xml
index 5aab234785219646ebaef3541657e605fec83236..491645ad2dcb58887c9284aed1874d89c203b6ec 100644
--- a/smp-resource-extensions/oasis-smp-spi/src/test/resources/examples/services/ResourceTestSgId2.xml
+++ b/smp-resource-extensions/oasis-smp-spi/src/test/resources/examples/services/ResourceTestSgId2.xml
@@ -3,7 +3,7 @@
#START_LICENSE#
oasis-smp-spi
%%
- Copyright (C) 2017 - 2023 European Commission | eDelivery | DomiSMP
+ Copyright (C) 2017 - 2024 European Commission | eDelivery | DomiSMP
%%
Licensed under the EUPL, Version 1.2 or – as soon they will be approved by the European Commission - subsequent
versions of the EUPL (the "Licence");
diff --git a/smp-resource-extensions/oasis-smp-spi/src/test/resources/examples/services/SignedSubresourcePoland.xml b/smp-resource-extensions/oasis-smp-spi/src/test/resources/examples/services/SignedSubresourcePoland.xml
index e406c489c5dff17ab9708a1b7f6837889fa67d02..1dcc5834e66d469ea2fbe049321a92e5d11a6f5c 100644
--- a/smp-resource-extensions/oasis-smp-spi/src/test/resources/examples/services/SignedSubresourcePoland.xml
+++ b/smp-resource-extensions/oasis-smp-spi/src/test/resources/examples/services/SignedSubresourcePoland.xml
@@ -3,7 +3,7 @@
#START_LICENSE#
oasis-smp-spi
%%
- Copyright (C) 2017 - 2023 European Commission | eDelivery | DomiSMP
+ Copyright (C) 2017 - 2024 European Commission | eDelivery | DomiSMP
%%
Licensed under the EUPL, Version 1.2 or – as soon they will be approved by the European Commission - subsequent
versions of the EUPL (the "Licence");
diff --git a/smp-resource-extensions/oasis-smp-spi/src/test/resources/examples/services/SubresourceDifferentCertificatesTypes.xml b/smp-resource-extensions/oasis-smp-spi/src/test/resources/examples/services/SubresourceDifferentCertificatesTypes.xml
index 7e1b6cf9b1a51de141127df0ea5229ec10011be5..d9a6bb96be43f13df7f0bd615692fa0980743e24 100644
--- a/smp-resource-extensions/oasis-smp-spi/src/test/resources/examples/services/SubresourceDifferentCertificatesTypes.xml
+++ b/smp-resource-extensions/oasis-smp-spi/src/test/resources/examples/services/SubresourceDifferentCertificatesTypes.xml
@@ -3,7 +3,7 @@
#START_LICENSE#
oasis-smp-spi
%%
- Copyright (C) 2017 - 2023 European Commission | eDelivery | DomiSMP
+ Copyright (C) 2017 - 2024 European Commission | eDelivery | DomiSMP
%%
Licensed under the EUPL, Version 1.2 or – as soon they will be approved by the European Commission - subsequent
versions of the EUPL (the "Licence");
diff --git a/smp-resource-extensions/oasis-smp-spi/src/test/resources/examples/services/SubresourcePoland.xml b/smp-resource-extensions/oasis-smp-spi/src/test/resources/examples/services/SubresourcePoland.xml
index fee648b7568a8ff610b1c432524405f96fe30200..ce5c1ab13893d7affb13b3519516e5502f331c41 100644
--- a/smp-resource-extensions/oasis-smp-spi/src/test/resources/examples/services/SubresourcePoland.xml
+++ b/smp-resource-extensions/oasis-smp-spi/src/test/resources/examples/services/SubresourcePoland.xml
@@ -3,7 +3,7 @@
#START_LICENSE#
oasis-smp-spi
%%
- Copyright (C) 2017 - 2023 European Commission | eDelivery | DomiSMP
+ Copyright (C) 2017 - 2024 European Commission | eDelivery | DomiSMP
%%
Licensed under the EUPL, Version 1.2 or – as soon they will be approved by the European Commission - subsequent
versions of the EUPL (the "Licence");
diff --git a/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/auth/SMPAuthenticationToken.java b/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/auth/SMPAuthenticationToken.java
index da768555f95cdbd775abf5dc4a093250cdb1dba1..c63af98c9bf8427717943e15f4ba942dda3f277d 100644
--- a/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/auth/SMPAuthenticationToken.java
+++ b/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/auth/SMPAuthenticationToken.java
@@ -2,7 +2,7 @@
* #START_LICENSE#
* smp-server-library
* %%
- * Copyright (C) 2017 - 2023 European Commission | eDelivery | DomiSMP
+ * Copyright (C) 2017 - 2024 European Commission | eDelivery | DomiSMP
* %%
* Licensed under the EUPL, Version 1.2 or – as soon they will be approved by the European Commission - subsequent
* versions of the EUPL (the "Licence");
diff --git a/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/auth/SMPCertificateAuthentication.java b/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/auth/SMPCertificateAuthentication.java
index c4ddac918bf354bbc40e9b8fb116831681ec2e5a..cb259513032a9cbe08b805f82bd9e181ebac8b74 100644
--- a/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/auth/SMPCertificateAuthentication.java
+++ b/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/auth/SMPCertificateAuthentication.java
@@ -2,7 +2,7 @@
* #START_LICENSE#
* smp-server-library
* %%
- * Copyright (C) 2017 - 2023 European Commission | eDelivery | DomiSMP
+ * Copyright (C) 2017 - 2024 European Commission | eDelivery | DomiSMP
* %%
* Licensed under the EUPL, Version 1.2 or – as soon they will be approved by the European Commission - subsequent
* versions of the EUPL (the "Licence");
@@ -16,21 +16,6 @@
* See the Licence for the specific language governing permissions and limitations under the Licence.
* #END_LICENSE#
*/
-/**
- * Copyright 2017 - European Commission | CEF eDelivery
- * <p>
- * Licensed under the EUPL, Version 1.2 (the "License");
- * You may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * <p>
- * \BDMSL\bdmsl-parent-pom\LICENSE-EUPL-v1.2.pdf or https://joinup.ec.europa.eu/sites/default/files/custom-page/attachment/eupl_v1.2_en.pdf
- * <p>
- * 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 eu.europa.ec.edelivery.smp.auth;
diff --git a/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/auth/SMPUserDetails.java b/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/auth/SMPUserDetails.java
index f45cc4ee720b1f9098a1497d926eadfa093885e8..7c2f42f735ac738c8107535f789d872cdb5871a8 100644
--- a/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/auth/SMPUserDetails.java
+++ b/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/auth/SMPUserDetails.java
@@ -2,7 +2,7 @@
* #START_LICENSE#
* smp-server-library
* %%
- * Copyright (C) 2017 - 2023 European Commission | eDelivery | DomiSMP
+ * Copyright (C) 2017 - 2024 European Commission | eDelivery | DomiSMP
* %%
* Licensed under the EUPL, Version 1.2 or – as soon they will be approved by the European Commission - subsequent
* versions of the EUPL (the "Licence");
diff --git a/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/auth/UILoginAuthenticationToken.java b/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/auth/UILoginAuthenticationToken.java
index 8a6591fe038e102a0524f84c95d5fb9372076b32..5e2b4d90313568c9e2e2031b98e6cd73cb762bb2 100644
--- a/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/auth/UILoginAuthenticationToken.java
+++ b/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/auth/UILoginAuthenticationToken.java
@@ -2,7 +2,7 @@
* #START_LICENSE#
* smp-server-library
* %%
- * Copyright (C) 2017 - 2023 European Commission | eDelivery | DomiSMP
+ * Copyright (C) 2017 - 2024 European Commission | eDelivery | DomiSMP
* %%
* Licensed under the EUPL, Version 1.2 or – as soon they will be approved by the European Commission - subsequent
* versions of the EUPL (the "Licence");
diff --git a/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/auth/enums/SMPAutomationAuthenticationTypes.java b/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/auth/enums/SMPAutomationAuthenticationTypes.java
index b7613fc8c07248b7119f723be249179b992e76a9..c7b2329f788af45e3435e4988ca82c25b8632c07 100644
--- a/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/auth/enums/SMPAutomationAuthenticationTypes.java
+++ b/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/auth/enums/SMPAutomationAuthenticationTypes.java
@@ -2,7 +2,7 @@
* #START_LICENSE#
* smp-server-library
* %%
- * Copyright (C) 2017 - 2023 European Commission | eDelivery | DomiSMP
+ * Copyright (C) 2017 - 2024 European Commission | eDelivery | DomiSMP
* %%
* Licensed under the EUPL, Version 1.2 or – as soon they will be approved by the European Commission - subsequent
* versions of the EUPL (the "Licence");
diff --git a/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/auth/enums/SMPUserAuthenticationTypes.java b/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/auth/enums/SMPUserAuthenticationTypes.java
index 6af9bb685699ac1874b3f5e2d8bec9f9c7a2ac91..e6fe55ffb1b298cdc49de81ee5b997360bf3e075 100644
--- a/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/auth/enums/SMPUserAuthenticationTypes.java
+++ b/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/auth/enums/SMPUserAuthenticationTypes.java
@@ -2,7 +2,7 @@
* #START_LICENSE#
* smp-server-library
* %%
- * Copyright (C) 2017 - 2023 European Commission | eDelivery | DomiSMP
+ * Copyright (C) 2017 - 2024 European Commission | eDelivery | DomiSMP
* %%
* Licensed under the EUPL, Version 1.2 or – as soon they will be approved by the European Commission - subsequent
* versions of the EUPL (the "Licence");
diff --git a/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/config/DatabaseProperties.java b/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/config/DatabaseProperties.java
index 4d7ded3beddf890eb016d882cbae90658d87d190..04787384baa36c4d5e7d775db41ade0bf62d6e47 100644
--- a/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/config/DatabaseProperties.java
+++ b/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/config/DatabaseProperties.java
@@ -2,7 +2,7 @@
* #START_LICENSE#
* smp-server-library
* %%
- * Copyright (C) 2017 - 2023 European Commission | eDelivery | DomiSMP
+ * Copyright (C) 2017 - 2024 European Commission | eDelivery | DomiSMP
* %%
* Licensed under the EUPL, Version 1.2 or – as soon they will be approved by the European Commission - subsequent
* versions of the EUPL (the "Licence");
diff --git a/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/config/PropertyUpdateListener.java b/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/config/PropertyUpdateListener.java
index db87c59cf098933a1355a01d2e8c8f6823954adc..f14208a761569f526e352f87757aa6ad5d60cd18 100644
--- a/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/config/PropertyUpdateListener.java
+++ b/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/config/PropertyUpdateListener.java
@@ -2,7 +2,7 @@
* #START_LICENSE#
* smp-server-library
* %%
- * Copyright (C) 2017 - 2023 European Commission | eDelivery | DomiSMP
+ * Copyright (C) 2017 - 2024 European Commission | eDelivery | DomiSMP
* %%
* Licensed under the EUPL, Version 1.2 or – as soon they will be approved by the European Commission - subsequent
* versions of the EUPL (the "Licence");
diff --git a/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/config/SMPDatabaseConfig.java b/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/config/SMPDatabaseConfig.java
index aa2abf63690f803c8b7e021d1f3a899974d8d46e..68e41fb0a1dc7245a6ef990df2a6408d1f3b9171 100644
--- a/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/config/SMPDatabaseConfig.java
+++ b/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/config/SMPDatabaseConfig.java
@@ -2,7 +2,7 @@
* #START_LICENSE#
* smp-webapp
* %%
- * Copyright (C) 2017 - 2023 European Commission | eDelivery | DomiSMP
+ * Copyright (C) 2017 - 2024 European Commission | eDelivery | DomiSMP
* %%
* Licensed under the EUPL, Version 1.2 or – as soon they will be approved by the European Commission - subsequent
* versions of the EUPL (the "Licence");
diff --git a/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/config/SMPEnvironmentProperties.java b/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/config/SMPEnvironmentProperties.java
index 46b3bbea4a462cf2bc7670a845e89c5c80be3f72..b3b1de294aa85483e28955ad4ed9ca6f2d8d5ff3 100644
--- a/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/config/SMPEnvironmentProperties.java
+++ b/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/config/SMPEnvironmentProperties.java
@@ -2,7 +2,7 @@
* #START_LICENSE#
* smp-server-library
* %%
- * Copyright (C) 2017 - 2023 European Commission | eDelivery | DomiSMP
+ * Copyright (C) 2017 - 2024 European Commission | eDelivery | DomiSMP
* %%
* Licensed under the EUPL, Version 1.2 or – as soon they will be approved by the European Commission - subsequent
* versions of the EUPL (the "Licence");
diff --git a/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/config/ServicesBeansConfiguration.java b/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/config/ServicesBeansConfiguration.java
index 360849ee0e1100c64a4c741506276c0017442d0d..1a2563189617bb2a588d1101b5f65e2b26e05678 100644
--- a/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/config/ServicesBeansConfiguration.java
+++ b/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/config/ServicesBeansConfiguration.java
@@ -2,7 +2,7 @@
* #START_LICENSE#
* smp-server-library
* %%
- * Copyright (C) 2017 - 2023 European Commission | eDelivery | DomiSMP
+ * Copyright (C) 2017 - 2024 European Commission | eDelivery | DomiSMP
* %%
* Licensed under the EUPL, Version 1.2 or – as soon they will be approved by the European Commission - subsequent
* versions of the EUPL (the "Licence");
diff --git a/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/config/enums/SMPEnumConstants.java b/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/config/enums/SMPEnumConstants.java
index 2fdf19d632d62f2a3c642d8de7f48854d55b76bd..c25102be8caae981416031e6d08d6145eb007f43 100644
--- a/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/config/enums/SMPEnumConstants.java
+++ b/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/config/enums/SMPEnumConstants.java
@@ -2,7 +2,7 @@
* #START_LICENSE#
* smp-server-library
* %%
- * Copyright (C) 2017 - 2023 European Commission | eDelivery | DomiSMP
+ * Copyright (C) 2017 - 2024 European Commission | eDelivery | DomiSMP
* %%
* Licensed under the EUPL, Version 1.2 or – as soon they will be approved by the European Commission - subsequent
* versions of the EUPL (the "Licence");
diff --git a/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/config/enums/SMPEnvPropertyEnum.java b/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/config/enums/SMPEnvPropertyEnum.java
index d938b6ea85e5938515b8f002ebf47e472d1e9f87..5382680b467cadac615bf9e540ff2c577e5ea228 100644
--- a/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/config/enums/SMPEnvPropertyEnum.java
+++ b/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/config/enums/SMPEnvPropertyEnum.java
@@ -2,7 +2,7 @@
* #START_LICENSE#
* smp-server-library
* %%
- * Copyright (C) 2017 - 2023 European Commission | eDelivery | DomiSMP
+ * Copyright (C) 2017 - 2024 European Commission | eDelivery | DomiSMP
* %%
* Licensed under the EUPL, Version 1.2 or – as soon they will be approved by the European Commission - subsequent
* versions of the EUPL (the "Licence");
diff --git a/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/config/enums/SMPPropertyEnum.java b/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/config/enums/SMPPropertyEnum.java
index 5b084de70530d533c68bd9793146e0b475addaf3..c3e78dadb856002dc088920bcdf8802f0679809e 100644
--- a/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/config/enums/SMPPropertyEnum.java
+++ b/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/config/enums/SMPPropertyEnum.java
@@ -2,7 +2,7 @@
* #START_LICENSE#
* smp-server-library
* %%
- * Copyright (C) 2017 - 2023 European Commission | eDelivery | DomiSMP
+ * Copyright (C) 2017 - 2024 European Commission | eDelivery | DomiSMP
* %%
* Licensed under the EUPL, Version 1.2 or – as soon they will be approved by the European Commission - subsequent
* versions of the EUPL (the "Licence");
diff --git a/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/config/enums/SMPPropertyTypeEnum.java b/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/config/enums/SMPPropertyTypeEnum.java
index 4865d4d94c17396c1c5939c6fe16549e992bedeb..714a7bf8b71e043778c8e8db630480237c91a726 100644
--- a/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/config/enums/SMPPropertyTypeEnum.java
+++ b/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/config/enums/SMPPropertyTypeEnum.java
@@ -2,7 +2,7 @@
* #START_LICENSE#
* smp-server-library
* %%
- * Copyright (C) 2017 - 2023 European Commission | eDelivery | DomiSMP
+ * Copyright (C) 2017 - 2024 European Commission | eDelivery | DomiSMP
* %%
* Licensed under the EUPL, Version 1.2 or – as soon they will be approved by the European Commission - subsequent
* versions of the EUPL (the "Licence");
diff --git a/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/config/init/DatabaseConnectionBeanCreator.java b/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/config/init/DatabaseConnectionBeanCreator.java
index 2331eee94d4019f8ac881b2c63cca843b8cb5756..0e36ec6f3b341770d23609e348f5f6be10ec5d80 100644
--- a/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/config/init/DatabaseConnectionBeanCreator.java
+++ b/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/config/init/DatabaseConnectionBeanCreator.java
@@ -2,7 +2,7 @@
* #START_LICENSE#
* smp-server-library
* %%
- * Copyright (C) 2017 - 2023 European Commission | eDelivery | DomiSMP
+ * Copyright (C) 2017 - 2024 European Commission | eDelivery | DomiSMP
* %%
* Licensed under the EUPL, Version 1.2 or – as soon they will be approved by the European Commission - subsequent
* versions of the EUPL (the "Licence");
diff --git a/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/config/init/DatabaseConnectionProperties.java b/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/config/init/DatabaseConnectionProperties.java
index 8998ad3704bd8e606fae87e87578a075ba464bdf..99412674bb651373851e0eca64153b7d8aced12e 100644
--- a/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/config/init/DatabaseConnectionProperties.java
+++ b/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/config/init/DatabaseConnectionProperties.java
@@ -2,7 +2,7 @@
* #START_LICENSE#
* smp-server-library
* %%
- * Copyright (C) 2017 - 2023 European Commission | eDelivery | DomiSMP
+ * Copyright (C) 2017 - 2024 European Commission | eDelivery | DomiSMP
* %%
* Licensed under the EUPL, Version 1.2 or – as soon they will be approved by the European Commission - subsequent
* versions of the EUPL (the "Licence");
diff --git a/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/config/init/SMPConfigurationInitializer.java b/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/config/init/SMPConfigurationInitializer.java
index ec6fe3ffe7feecef7174e8707dbb4cc00570067b..fdd314be08a0629d817715af03c1e43412c45bad 100644
--- a/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/config/init/SMPConfigurationInitializer.java
+++ b/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/config/init/SMPConfigurationInitializer.java
@@ -2,7 +2,7 @@
* #START_LICENSE#
* smp-server-library
* %%
- * Copyright (C) 2017 - 2023 European Commission | eDelivery | DomiSMP
+ * Copyright (C) 2017 - 2024 European Commission | eDelivery | DomiSMP
* %%
* Licensed under the EUPL, Version 1.2 or – as soon they will be approved by the European Commission - subsequent
* versions of the EUPL (the "Licence");
diff --git a/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/config/init/SMPExtensionInitializer.java b/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/config/init/SMPExtensionInitializer.java
index e9e292f042f92e4c5c31b99f527a638f9be933e9..f11b4db065911c8481fd233816abdb9edb47cec8 100644
--- a/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/config/init/SMPExtensionInitializer.java
+++ b/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/config/init/SMPExtensionInitializer.java
@@ -2,7 +2,7 @@
* #START_LICENSE#
* smp-server-library
* %%
- * Copyright (C) 2017 - 2023 European Commission | eDelivery | DomiSMP
+ * Copyright (C) 2017 - 2024 European Commission | eDelivery | DomiSMP
* %%
* Licensed under the EUPL, Version 1.2 or – as soon they will be approved by the European Commission - subsequent
* versions of the EUPL (the "Licence");
diff --git a/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/config/init/SMPKeystoreConfBuilder.java b/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/config/init/SMPKeystoreConfBuilder.java
index ae35f5986b55955883843f15bf39513b39bfdf71..db70ce587b14dbfe0ce22ec4e25b440778ab5e27 100644
--- a/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/config/init/SMPKeystoreConfBuilder.java
+++ b/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/config/init/SMPKeystoreConfBuilder.java
@@ -2,7 +2,7 @@
* #START_LICENSE#
* smp-server-library
* %%
- * Copyright (C) 2017 - 2023 European Commission | eDelivery | DomiSMP
+ * Copyright (C) 2017 - 2024 European Commission | eDelivery | DomiSMP
* %%
* Licensed under the EUPL, Version 1.2 or – as soon they will be approved by the European Commission - subsequent
* versions of the EUPL (the "Licence");
diff --git a/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/conversion/CertificateROToDBCertificateConverter.java b/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/conversion/CertificateROToDBCertificateConverter.java
index 7eb47a3a52487764ff9de10a878879eb003bdd9e..ff3619ff0869ef1ada148cea95d96931875e2626 100644
--- a/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/conversion/CertificateROToDBCertificateConverter.java
+++ b/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/conversion/CertificateROToDBCertificateConverter.java
@@ -2,7 +2,7 @@
* #START_LICENSE#
* smp-server-library
* %%
- * Copyright (C) 2017 - 2023 European Commission | eDelivery | DomiSMP
+ * Copyright (C) 2017 - 2024 European Commission | eDelivery | DomiSMP
* %%
* Licensed under the EUPL, Version 1.2 or – as soon they will be approved by the European Commission - subsequent
* versions of the EUPL (the "Licence");
diff --git a/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/conversion/ConvertersRegistrar.java b/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/conversion/ConvertersRegistrar.java
index 9445a490af65cc8b83bc38e34fd043f01eeed7e4..455f7f4a85132f4999ec5644e58307fb86a7f54e 100644
--- a/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/conversion/ConvertersRegistrar.java
+++ b/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/conversion/ConvertersRegistrar.java
@@ -2,7 +2,7 @@
* #START_LICENSE#
* smp-server-library
* %%
- * Copyright (C) 2017 - 2023 European Commission | eDelivery | DomiSMP
+ * Copyright (C) 2017 - 2024 European Commission | eDelivery | DomiSMP
* %%
* Licensed under the EUPL, Version 1.2 or – as soon they will be approved by the European Commission - subsequent
* versions of the EUPL (the "Licence");
diff --git a/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/conversion/CredentialROToDBCredentialConverter.java b/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/conversion/CredentialROToDBCredentialConverter.java
index 74eb673b5c7c72f80f5466214e041d7bab8b47e5..6b4873b328af87b406b643e8445620f5fc99b0bd 100644
--- a/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/conversion/CredentialROToDBCredentialConverter.java
+++ b/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/conversion/CredentialROToDBCredentialConverter.java
@@ -2,7 +2,7 @@
* #START_LICENSE#
* smp-server-library
* %%
- * Copyright (C) 2017 - 2023 European Commission | eDelivery | DomiSMP
+ * Copyright (C) 2017 - 2024 European Commission | eDelivery | DomiSMP
* %%
* Licensed under the EUPL, Version 1.2 or – as soon they will be approved by the European Commission - subsequent
* versions of the EUPL (the "Licence");
diff --git a/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/conversion/DBCertificateToCertificateROConverter.java b/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/conversion/DBCertificateToCertificateROConverter.java
index ae55e599569f864be2b0033d9f9a0bf6a8e0b13d..2165e3f9ad454a31198a40693b5fdf7b66e1b896 100644
--- a/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/conversion/DBCertificateToCertificateROConverter.java
+++ b/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/conversion/DBCertificateToCertificateROConverter.java
@@ -2,7 +2,7 @@
* #START_LICENSE#
* smp-server-library
* %%
- * Copyright (C) 2017 - 2023 European Commission | eDelivery | DomiSMP
+ * Copyright (C) 2017 - 2024 European Commission | eDelivery | DomiSMP
* %%
* Licensed under the EUPL, Version 1.2 or – as soon they will be approved by the European Commission - subsequent
* versions of the EUPL (the "Licence");
diff --git a/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/conversion/DBCredentialToCredentialROConverter.java b/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/conversion/DBCredentialToCredentialROConverter.java
index 427271e6720179496171921ff4cf3b357b7259d4..862837bc36e96370b712bcf80eba68b04b86bcb7 100644
--- a/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/conversion/DBCredentialToCredentialROConverter.java
+++ b/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/conversion/DBCredentialToCredentialROConverter.java
@@ -2,7 +2,7 @@
* #START_LICENSE#
* smp-server-library
* %%
- * Copyright (C) 2017 - 2023 European Commission | eDelivery | DomiSMP
+ * Copyright (C) 2017 - 2024 European Commission | eDelivery | DomiSMP
* %%
* Licensed under the EUPL, Version 1.2 or – as soon they will be approved by the European Commission - subsequent
* versions of the EUPL (the "Licence");
diff --git a/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/conversion/DBDomainMemberToMemberROConverter.java b/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/conversion/DBDomainMemberToMemberROConverter.java
index 4bbc2ec161120cc54dc51fa7d74f033a71342fe6..0f574b687e85a8d687089a44ac8023d69462d8e5 100644
--- a/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/conversion/DBDomainMemberToMemberROConverter.java
+++ b/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/conversion/DBDomainMemberToMemberROConverter.java
@@ -2,7 +2,7 @@
* #START_LICENSE#
* smp-server-library
* %%
- * Copyright (C) 2017 - 2023 European Commission | eDelivery | DomiSMP
+ * Copyright (C) 2017 - 2024 European Commission | eDelivery | DomiSMP
* %%
* Licensed under the EUPL, Version 1.2 or – as soon they will be approved by the European Commission - subsequent
* versions of the EUPL (the "Licence");
diff --git a/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/conversion/DBDomainToDomainROConverter.java b/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/conversion/DBDomainToDomainROConverter.java
index 63baed62a2c25718a2d34ba48e4ee7d86d82b6b3..6033d21098bbc2bf699af1ff4acb9241be96ad34 100644
--- a/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/conversion/DBDomainToDomainROConverter.java
+++ b/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/conversion/DBDomainToDomainROConverter.java
@@ -2,7 +2,7 @@
* #START_LICENSE#
* smp-server-library
* %%
- * Copyright (C) 2017 - 2023 European Commission | eDelivery | DomiSMP
+ * Copyright (C) 2017 - 2024 European Commission | eDelivery | DomiSMP
* %%
* Licensed under the EUPL, Version 1.2 or – as soon they will be approved by the European Commission - subsequent
* versions of the EUPL (the "Licence");
diff --git a/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/conversion/DBExtensionToExtensionROConverter.java b/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/conversion/DBExtensionToExtensionROConverter.java
index 49a57d87281adfcc9379d00d2483f496b36294cc..1357c8a418f3389ab7eb7f03d9a7c734f9a97a48 100644
--- a/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/conversion/DBExtensionToExtensionROConverter.java
+++ b/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/conversion/DBExtensionToExtensionROConverter.java
@@ -2,7 +2,7 @@
* #START_LICENSE#
* smp-server-library
* %%
- * Copyright (C) 2017 - 2023 European Commission | eDelivery | DomiSMP
+ * Copyright (C) 2017 - 2024 European Commission | eDelivery | DomiSMP
* %%
* Licensed under the EUPL, Version 1.2 or – as soon they will be approved by the European Commission - subsequent
* versions of the EUPL (the "Licence");
diff --git a/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/conversion/DBGroupMemberToMemberROConverter.java b/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/conversion/DBGroupMemberToMemberROConverter.java
index 91bf53aaecfe97cca99f1167c2dec0bd48bd122e..2fceb2d5fdbf9f43f38c86ce50e5acbafc231641 100644
--- a/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/conversion/DBGroupMemberToMemberROConverter.java
+++ b/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/conversion/DBGroupMemberToMemberROConverter.java
@@ -2,7 +2,7 @@
* #START_LICENSE#
* smp-server-library
* %%
- * Copyright (C) 2017 - 2023 European Commission | eDelivery | DomiSMP
+ * Copyright (C) 2017 - 2024 European Commission | eDelivery | DomiSMP
* %%
* Licensed under the EUPL, Version 1.2 or – as soon they will be approved by the European Commission - subsequent
* versions of the EUPL (the "Licence");
diff --git a/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/conversion/DBGroupToGroupROConverter.java b/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/conversion/DBGroupToGroupROConverter.java
index 4db96504d15ae11b3bf68c1ebf87dd75c51ea22e..92a0c9549f37f753f0139c9cbc4774cb7b44d363 100644
--- a/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/conversion/DBGroupToGroupROConverter.java
+++ b/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/conversion/DBGroupToGroupROConverter.java
@@ -2,7 +2,7 @@
* #START_LICENSE#
* smp-server-library
* %%
- * Copyright (C) 2017 - 2023 European Commission | eDelivery | DomiSMP
+ * Copyright (C) 2017 - 2024 European Commission | eDelivery | DomiSMP
* %%
* Licensed under the EUPL, Version 1.2 or – as soon they will be approved by the European Commission - subsequent
* versions of the EUPL (the "Licence");
diff --git a/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/conversion/DBResourceDefToResourceDefinitionROConverter.java b/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/conversion/DBResourceDefToResourceDefinitionROConverter.java
index 1b1851d5a5829bd827ce4a2ef29364cfb8801899..7826130b8e2214776c96e098410b36e956cc0401 100644
--- a/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/conversion/DBResourceDefToResourceDefinitionROConverter.java
+++ b/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/conversion/DBResourceDefToResourceDefinitionROConverter.java
@@ -2,7 +2,7 @@
* #START_LICENSE#
* smp-server-library
* %%
- * Copyright (C) 2017 - 2023 European Commission | eDelivery | DomiSMP
+ * Copyright (C) 2017 - 2024 European Commission | eDelivery | DomiSMP
* %%
* Licensed under the EUPL, Version 1.2 or – as soon they will be approved by the European Commission - subsequent
* versions of the EUPL (the "Licence");
diff --git a/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/conversion/DBResourceMemberToMemberROConverter.java b/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/conversion/DBResourceMemberToMemberROConverter.java
index 0bae8879335703ae16fd7faf31b588ca50b8f3fe..5361df37662674fbfb284c6710ef52af0b81f943 100644
--- a/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/conversion/DBResourceMemberToMemberROConverter.java
+++ b/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/conversion/DBResourceMemberToMemberROConverter.java
@@ -2,7 +2,7 @@
* #START_LICENSE#
* smp-server-library
* %%
- * Copyright (C) 2017 - 2023 European Commission | eDelivery | DomiSMP
+ * Copyright (C) 2017 - 2024 European Commission | eDelivery | DomiSMP
* %%
* Licensed under the EUPL, Version 1.2 or – as soon they will be approved by the European Commission - subsequent
* versions of the EUPL (the "Licence");
diff --git a/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/conversion/DBResourceToResourceROConverter.java b/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/conversion/DBResourceToResourceROConverter.java
index 1c2fce59e1701186f7d8606f3c74560939f8cc42..84f7167195ab6d33d543f8fd02dc7f297332fcbb 100644
--- a/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/conversion/DBResourceToResourceROConverter.java
+++ b/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/conversion/DBResourceToResourceROConverter.java
@@ -2,7 +2,7 @@
* #START_LICENSE#
* smp-server-library
* %%
- * Copyright (C) 2017 - 2023 European Commission | eDelivery | DomiSMP
+ * Copyright (C) 2017 - 2024 European Commission | eDelivery | DomiSMP
* %%
* Licensed under the EUPL, Version 1.2 or – as soon they will be approved by the European Commission - subsequent
* versions of the EUPL (the "Licence");
diff --git a/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/conversion/DBSubresourceDefToSubresourceDefinitionROConverter.java b/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/conversion/DBSubresourceDefToSubresourceDefinitionROConverter.java
index 7d489801f3f409c7e93b8b8f720209aac9922125..7ed85f2e4d9991a00947ade2fd523e6c4638fecd 100644
--- a/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/conversion/DBSubresourceDefToSubresourceDefinitionROConverter.java
+++ b/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/conversion/DBSubresourceDefToSubresourceDefinitionROConverter.java
@@ -2,7 +2,7 @@
* #START_LICENSE#
* smp-server-library
* %%
- * Copyright (C) 2017 - 2023 European Commission | eDelivery | DomiSMP
+ * Copyright (C) 2017 - 2024 European Commission | eDelivery | DomiSMP
* %%
* Licensed under the EUPL, Version 1.2 or – as soon they will be approved by the European Commission - subsequent
* versions of the EUPL (the "Licence");
diff --git a/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/conversion/DBSubresourceToSubresourceROConverter.java b/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/conversion/DBSubresourceToSubresourceROConverter.java
index e4b358b811f603ffcd8f2effc019c3f95d0b21aa..44824a7100d75cd1347850f5a6f190a5d871a113 100644
--- a/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/conversion/DBSubresourceToSubresourceROConverter.java
+++ b/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/conversion/DBSubresourceToSubresourceROConverter.java
@@ -2,7 +2,7 @@
* #START_LICENSE#
* smp-server-library
* %%
- * Copyright (C) 2017 - 2023 European Commission | eDelivery | DomiSMP
+ * Copyright (C) 2017 - 2024 European Commission | eDelivery | DomiSMP
* %%
* Licensed under the EUPL, Version 1.2 or – as soon they will be approved by the European Commission - subsequent
* versions of the EUPL (the "Licence");
diff --git a/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/conversion/DBUserToSearchUserROConverter.java b/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/conversion/DBUserToSearchUserROConverter.java
index 72c3f3b952356c56ce8cb1673def34404871dcc7..170cb8f60fbe93ce34bb0fc12ced117138bec56c 100644
--- a/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/conversion/DBUserToSearchUserROConverter.java
+++ b/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/conversion/DBUserToSearchUserROConverter.java
@@ -2,7 +2,7 @@
* #START_LICENSE#
* smp-server-library
* %%
- * Copyright (C) 2017 - 2023 European Commission | eDelivery | DomiSMP
+ * Copyright (C) 2017 - 2024 European Commission | eDelivery | DomiSMP
* %%
* Licensed under the EUPL, Version 1.2 or – as soon they will be approved by the European Commission - subsequent
* versions of the EUPL (the "Licence");
diff --git a/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/conversion/DBUserToUserROConverter.java b/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/conversion/DBUserToUserROConverter.java
index 72f3fbdf949bab67d066804d05dbf74fbc9ab324..75777ebf62a2a04a7560f49984eb1807145466ec 100644
--- a/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/conversion/DBUserToUserROConverter.java
+++ b/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/conversion/DBUserToUserROConverter.java
@@ -2,7 +2,7 @@
* #START_LICENSE#
* smp-server-library
* %%
- * Copyright (C) 2017 - 2023 European Commission | eDelivery | DomiSMP
+ * Copyright (C) 2017 - 2024 European Commission | eDelivery | DomiSMP
* %%
* Licensed under the EUPL, Version 1.2 or – as soon they will be approved by the European Commission - subsequent
* versions of the EUPL (the "Licence");
diff --git a/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/conversion/IdentifierService.java b/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/conversion/IdentifierService.java
index de4653d9a4bd7a77648cc0467cc96e126d4f87d7..6f6b3df2fbed05fa5a55d98ef019c72578b0eeb7 100644
--- a/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/conversion/IdentifierService.java
+++ b/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/conversion/IdentifierService.java
@@ -2,7 +2,7 @@
* #START_LICENSE#
* smp-webapp
* %%
- * Copyright (C) 2017 - 2023 European Commission | eDelivery | DomiSMP
+ * Copyright (C) 2017 - 2024 European Commission | eDelivery | DomiSMP
* %%
* Licensed under the EUPL, Version 1.2 or – as soon they will be approved by the European Commission - subsequent
* versions of the EUPL (the "Licence");
diff --git a/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/conversion/SmlIdentifierConverter.java b/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/conversion/SmlIdentifierConverter.java
index 67e76057b5c64ce162e1a3f1ec15f0292a2d9e4e..473baba84fb197a7813f2a43a271286b14e46619 100644
--- a/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/conversion/SmlIdentifierConverter.java
+++ b/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/conversion/SmlIdentifierConverter.java
@@ -2,7 +2,7 @@
* #START_LICENSE#
* smp-webapp
* %%
- * Copyright (C) 2017 - 2023 European Commission | eDelivery | DomiSMP
+ * Copyright (C) 2017 - 2024 European Commission | eDelivery | DomiSMP
* %%
* Licensed under the EUPL, Version 1.2 or – as soon they will be approved by the European Commission - subsequent
* versions of the EUPL (the "Licence");
diff --git a/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/conversion/UserROToDBUserConverter.java b/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/conversion/UserROToDBUserConverter.java
index 17512c29d4a2ec5d5ae4f76714bb5b1956a38900..bc1a77fd69157cc3c93818d7d602f735b4dd9b8b 100644
--- a/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/conversion/UserROToDBUserConverter.java
+++ b/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/conversion/UserROToDBUserConverter.java
@@ -2,7 +2,7 @@
* #START_LICENSE#
* smp-server-library
* %%
- * Copyright (C) 2017 - 2023 European Commission | eDelivery | DomiSMP
+ * Copyright (C) 2017 - 2024 European Commission | eDelivery | DomiSMP
* %%
* Licensed under the EUPL, Version 1.2 or – as soon they will be approved by the European Commission - subsequent
* versions of the EUPL (the "Licence");
diff --git a/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/conversion/X509CertificateToCertificateROConverter.java b/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/conversion/X509CertificateToCertificateROConverter.java
index f63e6c8e96a841ff7dc26d940d3790147b8c7896..22e172a88f9cfe3d6f84f74980ab1eca3aaf39b6 100644
--- a/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/conversion/X509CertificateToCertificateROConverter.java
+++ b/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/conversion/X509CertificateToCertificateROConverter.java
@@ -2,7 +2,7 @@
* #START_LICENSE#
* smp-server-library
* %%
- * Copyright (C) 2017 - 2023 European Commission | eDelivery | DomiSMP
+ * Copyright (C) 2017 - 2024 European Commission | eDelivery | DomiSMP
* %%
* Licensed under the EUPL, Version 1.2 or – as soon they will be approved by the European Commission - subsequent
* versions of the EUPL (the "Licence");
@@ -49,6 +49,41 @@ import java.util.TimeZone;
*/
@Component
public class X509CertificateToCertificateROConverter implements Converter<X509Certificate, CertificateRO> {
+ /**
+ * Current support for EdEC key is limited and some JCE providers retun OID
+ * instead of SunJCE key name (which was added in JDK 16+).
+ * This enum is used to map OID to key type. When JDK 16+ is required, this enum can be removed.
+ */
+ enum KeyType {
+ ED25519("Ed25519", "1.3.101.112"),
+ ED448("Ed448", "1.3.101.113");
+
+ private final String jceKeyType;
+ private final String keyOid;
+
+ KeyType(String keyType, String oid) {
+ this.jceKeyType = keyType;
+ this.keyOid = oid;
+ }
+
+ public String getJceKeyType() {
+ return jceKeyType;
+ }
+
+ public String getKeyOid() {
+ return keyOid;
+ }
+
+ public static KeyType getKeyTypeByOid(String oid) {
+ for (KeyType kt : KeyType.values()) {
+ if (StringUtils.equals(kt.getKeyOid(), oid)) {
+ return kt;
+ }
+ }
+ return null;
+ }
+ }
+
private static final SMPLogger LOG = SMPLoggerFactory.getLogger(X509CertificateToCertificateROConverter.class);
private static final String S_CLIENT_CERT_DATEFORMAT = "MMM dd HH:mm:ss yyyy";
@@ -134,12 +169,18 @@ public class X509CertificateToCertificateROConverter implements Converter<X509Ce
}
return "";
}
+
+ /**
+ * Get key algorithm from key. Some JCE providers return OID instead of SunJCE key name.
+ * This method tries to map OID to key name.
+ *
+ * @param key
+ * @return JCE key algorithm name
+ */
public String getKeyAlgorithm(Key key) {
- if (StringUtils.equals(key.getAlgorithm(), "1.3.101.112")) {
- return "Ed25519";
- }
- if (StringUtils.equals(key.getAlgorithm(), "1.3.101.113")) {
- return "Ed448";
+ KeyType kt = KeyType.getKeyTypeByOid(key.getAlgorithm());
+ if (kt != null) {
+ return kt.getJceKeyType();
}
return key.getAlgorithm();
}
diff --git a/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/cron/CronTriggerConfig.java b/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/cron/CronTriggerConfig.java
index e0386350449c6b52ebba7ec25313c0f646ca852d..310fb99035596837ae8d180ce6924b1425dc768c 100644
--- a/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/cron/CronTriggerConfig.java
+++ b/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/cron/CronTriggerConfig.java
@@ -2,7 +2,7 @@
* #START_LICENSE#
* smp-server-library
* %%
- * Copyright (C) 2017 - 2023 European Commission | eDelivery | DomiSMP
+ * Copyright (C) 2017 - 2024 European Commission | eDelivery | DomiSMP
* %%
* Licensed under the EUPL, Version 1.2 or – as soon they will be approved by the European Commission - subsequent
* versions of the EUPL (the "Licence");
diff --git a/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/cron/SMPDynamicCronTrigger.java b/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/cron/SMPDynamicCronTrigger.java
index 4436300e6364467790bbb8c328a88e31f2e66ea9..fc4ffd834763a3772a74afac86bcf31300bfae88 100644
--- a/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/cron/SMPDynamicCronTrigger.java
+++ b/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/cron/SMPDynamicCronTrigger.java
@@ -2,7 +2,7 @@
* #START_LICENSE#
* smp-server-library
* %%
- * Copyright (C) 2017 - 2023 European Commission | eDelivery | DomiSMP
+ * Copyright (C) 2017 - 2024 European Commission | eDelivery | DomiSMP
* %%
* Licensed under the EUPL, Version 1.2 or – as soon they will be approved by the European Commission - subsequent
* versions of the EUPL (the "Licence");
diff --git a/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/data/dao/AlertDao.java b/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/data/dao/AlertDao.java
index 8f4cf83b47f392ad54b01564e6a52db6d02c9b1e..7ffc8b5ac5a724875d5d9b8b160720f9d72f6abd 100644
--- a/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/data/dao/AlertDao.java
+++ b/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/data/dao/AlertDao.java
@@ -2,7 +2,7 @@
* #START_LICENSE#
* smp-server-library
* %%
- * Copyright (C) 2017 - 2023 European Commission | eDelivery | DomiSMP
+ * Copyright (C) 2017 - 2024 European Commission | eDelivery | DomiSMP
* %%
* Licensed under the EUPL, Version 1.2 or – as soon they will be approved by the European Commission - subsequent
* versions of the EUPL (the "Licence");
diff --git a/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/data/dao/BaseDao.java b/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/data/dao/BaseDao.java
index ef9a8bc00f46b757b80f331f1e0a57a1fbed404f..e2c723a32cd900ff42bd61d4b40e87a0bc38e6fd 100644
--- a/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/data/dao/BaseDao.java
+++ b/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/data/dao/BaseDao.java
@@ -2,7 +2,7 @@
* #START_LICENSE#
* smp-webapp
* %%
- * Copyright (C) 2017 - 2023 European Commission | eDelivery | DomiSMP
+ * Copyright (C) 2017 - 2024 European Commission | eDelivery | DomiSMP
* %%
* Licensed under the EUPL, Version 1.2 or – as soon they will be approved by the European Commission - subsequent
* versions of the EUPL (the "Licence");
diff --git a/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/data/dao/ConfigurationDao.java b/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/data/dao/ConfigurationDao.java
index 3d3cd6e582bee9bc537d50e1d6990d58e52a38f4..8da7ddf5354db7f805fa67ba1a6b79e9feafddc4 100644
--- a/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/data/dao/ConfigurationDao.java
+++ b/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/data/dao/ConfigurationDao.java
@@ -2,7 +2,7 @@
* #START_LICENSE#
* smp-webapp
* %%
- * Copyright (C) 2017 - 2023 European Commission | eDelivery | DomiSMP
+ * Copyright (C) 2017 - 2024 European Commission | eDelivery | DomiSMP
* %%
* Licensed under the EUPL, Version 1.2 or – as soon they will be approved by the European Commission - subsequent
* versions of the EUPL (the "Licence");
diff --git a/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/data/dao/CredentialDao.java b/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/data/dao/CredentialDao.java
index 64ac2edc9d26f9565e342ac6ebfd702751c09f4b..d709fdb81e43e7a9c2b7225fd2326884dc3f9a60 100644
--- a/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/data/dao/CredentialDao.java
+++ b/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/data/dao/CredentialDao.java
@@ -2,7 +2,7 @@
* #START_LICENSE#
* smp-webapp
* %%
- * Copyright (C) 2017 - 2023 European Commission | eDelivery | DomiSMP
+ * Copyright (C) 2017 - 2024 European Commission | eDelivery | DomiSMP
* %%
* Licensed under the EUPL, Version 1.2 or – as soon they will be approved by the European Commission - subsequent
* versions of the EUPL (the "Licence");
diff --git a/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/data/dao/DocumentDao.java b/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/data/dao/DocumentDao.java
index f489cc86bc622169d06c218a60817a65441e7c0a..860bde5ab9bcaddae2715f4909d074143c7e735c 100644
--- a/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/data/dao/DocumentDao.java
+++ b/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/data/dao/DocumentDao.java
@@ -2,7 +2,7 @@
* #START_LICENSE#
* smp-server-library
* %%
- * Copyright (C) 2017 - 2023 European Commission | eDelivery | DomiSMP
+ * Copyright (C) 2017 - 2024 European Commission | eDelivery | DomiSMP
* %%
* Licensed under the EUPL, Version 1.2 or – as soon they will be approved by the European Commission - subsequent
* versions of the EUPL (the "Licence");
diff --git a/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/data/dao/DomainDao.java b/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/data/dao/DomainDao.java
index 9b07af0563a6aa2bba12555c2330bb78b762c7db..4c739082a84a067ece0f8903bcc302563b7193eb 100644
--- a/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/data/dao/DomainDao.java
+++ b/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/data/dao/DomainDao.java
@@ -2,7 +2,7 @@
* #START_LICENSE#
* smp-webapp
* %%
- * Copyright (C) 2017 - 2023 European Commission | eDelivery | DomiSMP
+ * Copyright (C) 2017 - 2024 European Commission | eDelivery | DomiSMP
* %%
* Licensed under the EUPL, Version 1.2 or – as soon they will be approved by the European Commission - subsequent
* versions of the EUPL (the "Licence");
@@ -30,7 +30,6 @@ import org.springframework.transaction.annotation.Transactional;
import javax.persistence.NoResultException;
import javax.persistence.NonUniqueResultException;
import javax.persistence.TypedQuery;
-import java.util.Arrays;
import java.util.List;
import java.util.Optional;
diff --git a/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/data/dao/DomainMemberDao.java b/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/data/dao/DomainMemberDao.java
index 9b8eff2dd2b70af3375fcbb36d3eebda59da2f9d..99724729279f9bc1c54c01bd92692e8383135a19 100644
--- a/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/data/dao/DomainMemberDao.java
+++ b/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/data/dao/DomainMemberDao.java
@@ -2,7 +2,7 @@
* #START_LICENSE#
* smp-webapp
* %%
- * Copyright (C) 2017 - 2023 European Commission | eDelivery | DomiSMP
+ * Copyright (C) 2017 - 2024 European Commission | eDelivery | DomiSMP
* %%
* Licensed under the EUPL, Version 1.2 or – as soon they will be approved by the European Commission - subsequent
* versions of the EUPL (the "Licence");
diff --git a/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/data/dao/DomainResourceDefDao.java b/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/data/dao/DomainResourceDefDao.java
index 3c1f8e124f0928f6e3dbeed2336048c476ca2483..9546a2adeed674c3463ef60011703b3366e4017c 100644
--- a/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/data/dao/DomainResourceDefDao.java
+++ b/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/data/dao/DomainResourceDefDao.java
@@ -2,7 +2,7 @@
* #START_LICENSE#
* smp-webapp
* %%
- * Copyright (C) 2017 - 2023 European Commission | eDelivery | DomiSMP
+ * Copyright (C) 2017 - 2024 European Commission | eDelivery | DomiSMP
* %%
* Licensed under the EUPL, Version 1.2 or – as soon they will be approved by the European Commission - subsequent
* versions of the EUPL (the "Licence");
diff --git a/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/data/dao/ExtensionDao.java b/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/data/dao/ExtensionDao.java
index e6b647fa994607c4df13641adf9bf585e28c06dd..c0a8fefd5c8d837641d8b27578c06d5ad84b9e1d 100644
--- a/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/data/dao/ExtensionDao.java
+++ b/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/data/dao/ExtensionDao.java
@@ -2,7 +2,7 @@
* #START_LICENSE#
* smp-webapp
* %%
- * Copyright (C) 2017 - 2023 European Commission | eDelivery | DomiSMP
+ * Copyright (C) 2017 - 2024 European Commission | eDelivery | DomiSMP
* %%
* Licensed under the EUPL, Version 1.2 or – as soon they will be approved by the European Commission - subsequent
* versions of the EUPL (the "Licence");
@@ -64,7 +64,7 @@ public class ExtensionDao extends BaseDao<DBExtension> {
* @throws IllegalStateException if no domain is not configured
*/
public Optional<DBExtension> getExtensionByIdentifier(String identifier) {
- LOG.debug("Get extension [[]] all extension", identifier);
+ LOG.debug("Get extension [{}] all extension", identifier);
try {
TypedQuery<DBExtension> query = memEManager.createNamedQuery(QUERY_EXTENSION_BY_IDENTIFIER, DBExtension.class);
query.setParameter(PARAM_IDENTIFIER, identifier);
diff --git a/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/data/dao/GroupDao.java b/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/data/dao/GroupDao.java
index 5e4f5ffa73e6a3f4a048379c952ba05f970547c6..29f449c985e9247c9656bb8c0369fa07ba8e6a69 100644
--- a/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/data/dao/GroupDao.java
+++ b/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/data/dao/GroupDao.java
@@ -2,7 +2,7 @@
* #START_LICENSE#
* smp-webapp
* %%
- * Copyright (C) 2017 - 2023 European Commission | eDelivery | DomiSMP
+ * Copyright (C) 2017 - 2024 European Commission | eDelivery | DomiSMP
* %%
* Licensed under the EUPL, Version 1.2 or – as soon they will be approved by the European Commission - subsequent
* versions of the EUPL (the "Licence");
diff --git a/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/data/dao/GroupMemberDao.java b/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/data/dao/GroupMemberDao.java
index c777618b6af031e36f37317db77c9b7c8f9f59a9..d59db82dcf843c05bb4580ffd910f16b18f14dc1 100644
--- a/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/data/dao/GroupMemberDao.java
+++ b/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/data/dao/GroupMemberDao.java
@@ -2,7 +2,7 @@
* #START_LICENSE#
* smp-webapp
* %%
- * Copyright (C) 2017 - 2023 European Commission | eDelivery | DomiSMP
+ * Copyright (C) 2017 - 2024 European Commission | eDelivery | DomiSMP
* %%
* Licensed under the EUPL, Version 1.2 or – as soon they will be approved by the European Commission - subsequent
* versions of the EUPL (the "Licence");
diff --git a/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/data/dao/QueryNames.java b/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/data/dao/QueryNames.java
index ff775ff7a7f796a4e90c7d9ec194e0831f212aeb..7d77d21af838d2b0dcc9a0b8bcc45b32103cf751 100644
--- a/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/data/dao/QueryNames.java
+++ b/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/data/dao/QueryNames.java
@@ -2,7 +2,7 @@
* #START_LICENSE#
* smp-server-library
* %%
- * Copyright (C) 2017 - 2023 European Commission | eDelivery | DomiSMP
+ * Copyright (C) 2017 - 2024 European Commission | eDelivery | DomiSMP
* %%
* Licensed under the EUPL, Version 1.2 or – as soon they will be approved by the European Commission - subsequent
* versions of the EUPL (the "Licence");
diff --git a/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/data/dao/ResourceDao.java b/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/data/dao/ResourceDao.java
index 54137f95261af08edb47e231c868deee2efeb83f..7de33a2b32fa6df481bfd4d5c6fa222343910157 100644
--- a/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/data/dao/ResourceDao.java
+++ b/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/data/dao/ResourceDao.java
@@ -2,7 +2,7 @@
* #START_LICENSE#
* smp-webapp
* %%
- * Copyright (C) 2017 - 2023 European Commission | eDelivery | DomiSMP
+ * Copyright (C) 2017 - 2024 European Commission | eDelivery | DomiSMP
* %%
* Licensed under the EUPL, Version 1.2 or – as soon they will be approved by the European Commission - subsequent
* versions of the EUPL (the "Licence");
diff --git a/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/data/dao/ResourceDefDao.java b/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/data/dao/ResourceDefDao.java
index db00b01fd2a64c37e53b1688af144b60bbd765a3..79f14e03792d7a19dc99c2b3edbca1828773dff4 100644
--- a/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/data/dao/ResourceDefDao.java
+++ b/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/data/dao/ResourceDefDao.java
@@ -2,7 +2,7 @@
* #START_LICENSE#
* smp-webapp
* %%
- * Copyright (C) 2017 - 2023 European Commission | eDelivery | DomiSMP
+ * Copyright (C) 2017 - 2024 European Commission | eDelivery | DomiSMP
* %%
* Licensed under the EUPL, Version 1.2 or – as soon they will be approved by the European Commission - subsequent
* versions of the EUPL (the "Licence");
diff --git a/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/data/dao/ResourceMemberDao.java b/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/data/dao/ResourceMemberDao.java
index e79bfb976bf0c0a94ed6d7c869a71154179700d9..483dc2b0a343ffdd1d7105caeb31283b29762803 100644
--- a/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/data/dao/ResourceMemberDao.java
+++ b/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/data/dao/ResourceMemberDao.java
@@ -2,7 +2,7 @@
* #START_LICENSE#
* smp-webapp
* %%
- * Copyright (C) 2017 - 2023 European Commission | eDelivery | DomiSMP
+ * Copyright (C) 2017 - 2024 European Commission | eDelivery | DomiSMP
* %%
* Licensed under the EUPL, Version 1.2 or – as soon they will be approved by the European Commission - subsequent
* versions of the EUPL (the "Licence");
diff --git a/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/data/dao/SMPRevisionListener.java b/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/data/dao/SMPRevisionListener.java
index 3b94e9dbd6cccb41f8d9a46af792d1910584f3ff..f6f7705208c17c0e2373f63a3f74169f6e28bbb4 100644
--- a/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/data/dao/SMPRevisionListener.java
+++ b/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/data/dao/SMPRevisionListener.java
@@ -2,7 +2,7 @@
* #START_LICENSE#
* smp-server-library
* %%
- * Copyright (C) 2017 - 2023 European Commission | eDelivery | DomiSMP
+ * Copyright (C) 2017 - 2024 European Commission | eDelivery | DomiSMP
* %%
* Licensed under the EUPL, Version 1.2 or – as soon they will be approved by the European Commission - subsequent
* versions of the EUPL (the "Licence");
diff --git a/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/data/dao/SubresourceDao.java b/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/data/dao/SubresourceDao.java
index e408c0b0e358049316868723bdf5d8483e74afbc..32b0efc42e2b946c9ee6fb6b4d53d5b15ed6418f 100644
--- a/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/data/dao/SubresourceDao.java
+++ b/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/data/dao/SubresourceDao.java
@@ -2,7 +2,7 @@
* #START_LICENSE#
* smp-webapp
* %%
- * Copyright (C) 2017 - 2023 European Commission | eDelivery | DomiSMP
+ * Copyright (C) 2017 - 2024 European Commission | eDelivery | DomiSMP
* %%
* Licensed under the EUPL, Version 1.2 or – as soon they will be approved by the European Commission - subsequent
* versions of the EUPL (the "Licence");
diff --git a/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/data/dao/SubresourceDefDao.java b/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/data/dao/SubresourceDefDao.java
index 8ebeb5b68dbbce1fa5130ecf5f57dd55b63677ce..ac9838ab8d2594edfa640271a2a07dbf48cd2f05 100644
--- a/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/data/dao/SubresourceDefDao.java
+++ b/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/data/dao/SubresourceDefDao.java
@@ -2,7 +2,7 @@
* #START_LICENSE#
* smp-webapp
* %%
- * Copyright (C) 2017 - 2023 European Commission | eDelivery | DomiSMP
+ * Copyright (C) 2017 - 2024 European Commission | eDelivery | DomiSMP
* %%
* Licensed under the EUPL, Version 1.2 or – as soon they will be approved by the European Commission - subsequent
* versions of the EUPL (the "Licence");
diff --git a/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/data/dao/UserDao.java b/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/data/dao/UserDao.java
index 00f8083d982a18e6a53765a03a2f2eec8c2c76ee..72b0ecb81a2e7afec480067b7c6c58b5077bb57a 100644
--- a/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/data/dao/UserDao.java
+++ b/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/data/dao/UserDao.java
@@ -2,7 +2,7 @@
* #START_LICENSE#
* smp-webapp
* %%
- * Copyright (C) 2017 - 2023 European Commission | eDelivery | DomiSMP
+ * Copyright (C) 2017 - 2024 European Commission | eDelivery | DomiSMP
* %%
* Licensed under the EUPL, Version 1.2 or – as soon they will be approved by the European Commission - subsequent
* versions of the EUPL (the "Licence");
diff --git a/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/data/dao/utils/ColumnDescription.java b/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/data/dao/utils/ColumnDescription.java
index f8a38b2094f836603a3505cf11b25a43080119d1..dbaec8149c89edcccb93759c2d392aba4a546b62 100644
--- a/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/data/dao/utils/ColumnDescription.java
+++ b/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/data/dao/utils/ColumnDescription.java
@@ -2,7 +2,7 @@
* #START_LICENSE#
* smp-server-library
* %%
- * Copyright (C) 2017 - 2023 European Commission | eDelivery | DomiSMP
+ * Copyright (C) 2017 - 2024 European Commission | eDelivery | DomiSMP
* %%
* Licensed under the EUPL, Version 1.2 or – as soon they will be approved by the European Commission - subsequent
* versions of the EUPL (the "Licence");
diff --git a/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/data/dao/utils/SMPMySQL5InnoDBDialect.java b/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/data/dao/utils/SMPMySQL5InnoDBDialect.java
index dfc13ec2173166d3396d8d22bf102b42f5c616f6..de4c4c9c86c5779707ce78f13abce99d7a2199a3 100644
--- a/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/data/dao/utils/SMPMySQL5InnoDBDialect.java
+++ b/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/data/dao/utils/SMPMySQL5InnoDBDialect.java
@@ -2,7 +2,7 @@
* #START_LICENSE#
* smp-server-library
* %%
- * Copyright (C) 2017 - 2023 European Commission | eDelivery | DomiSMP
+ * Copyright (C) 2017 - 2024 European Commission | eDelivery | DomiSMP
* %%
* Licensed under the EUPL, Version 1.2 or – as soon they will be approved by the European Commission - subsequent
* versions of the EUPL (the "Licence");
diff --git a/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/data/dao/utils/SMPSchemaGenerator.java b/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/data/dao/utils/SMPSchemaGenerator.java
index 1682a8b3ec726ff5e9f8d732d9475425a3f33bf5..b8f7065e1986619d6b33f6c8fda69555f9132761 100644
--- a/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/data/dao/utils/SMPSchemaGenerator.java
+++ b/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/data/dao/utils/SMPSchemaGenerator.java
@@ -2,7 +2,7 @@
* #START_LICENSE#
* smp-server-library
* %%
- * Copyright (C) 2017 - 2023 European Commission | eDelivery | DomiSMP
+ * Copyright (C) 2017 - 2024 European Commission | eDelivery | DomiSMP
* %%
* Licensed under the EUPL, Version 1.2 or – as soon they will be approved by the European Commission - subsequent
* versions of the EUPL (the "Licence");
diff --git a/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/data/enums/ApplicationRoleType.java b/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/data/enums/ApplicationRoleType.java
index c1618f4249e1ec937965161c8231617f939f8cc3..6255accb4eabca2cb3d254494cb168292c08b6ef 100644
--- a/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/data/enums/ApplicationRoleType.java
+++ b/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/data/enums/ApplicationRoleType.java
@@ -2,7 +2,7 @@
* #START_LICENSE#
* smp-server-library
* %%
- * Copyright (C) 2017 - 2023 European Commission | eDelivery | DomiSMP
+ * Copyright (C) 2017 - 2024 European Commission | eDelivery | DomiSMP
* %%
* Licensed under the EUPL, Version 1.2 or – as soon they will be approved by the European Commission - subsequent
* versions of the EUPL (the "Licence");
diff --git a/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/data/enums/CredentialTargetType.java b/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/data/enums/CredentialTargetType.java
index 1cd28b06e1cd38fa92f659244d3fab54c635d85d..ccda562a540bc58b6a71ed61923f46af0cc559df 100644
--- a/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/data/enums/CredentialTargetType.java
+++ b/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/data/enums/CredentialTargetType.java
@@ -2,7 +2,7 @@
* #START_LICENSE#
* smp-server-library
* %%
- * Copyright (C) 2017 - 2023 European Commission | eDelivery | DomiSMP
+ * Copyright (C) 2017 - 2024 European Commission | eDelivery | DomiSMP
* %%
* Licensed under the EUPL, Version 1.2 or – as soon they will be approved by the European Commission - subsequent
* versions of the EUPL (the "Licence");
diff --git a/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/data/enums/CredentialType.java b/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/data/enums/CredentialType.java
index 801a2dd2a5f464e4330852ba29f50c9c8fc88bfc..9527dee533e604b954cf42b3dc4b97925ecccfe3 100644
--- a/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/data/enums/CredentialType.java
+++ b/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/data/enums/CredentialType.java
@@ -2,7 +2,7 @@
* #START_LICENSE#
* smp-server-library
* %%
- * Copyright (C) 2017 - 2023 European Commission | eDelivery | DomiSMP
+ * Copyright (C) 2017 - 2024 European Commission | eDelivery | DomiSMP
* %%
* Licensed under the EUPL, Version 1.2 or – as soon they will be approved by the European Commission - subsequent
* versions of the EUPL (the "Licence");
diff --git a/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/data/enums/MembershipRoleType.java b/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/data/enums/MembershipRoleType.java
index 830b88b4d01e34842de168d791fe66904cada73f..939c425b13c7f42aa6ff9b0ae8410ee32eb69b33 100644
--- a/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/data/enums/MembershipRoleType.java
+++ b/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/data/enums/MembershipRoleType.java
@@ -2,7 +2,7 @@
* #START_LICENSE#
* smp-server-library
* %%
- * Copyright (C) 2017 - 2023 European Commission | eDelivery | DomiSMP
+ * Copyright (C) 2017 - 2024 European Commission | eDelivery | DomiSMP
* %%
* Licensed under the EUPL, Version 1.2 or – as soon they will be approved by the European Commission - subsequent
* versions of the EUPL (the "Licence");
diff --git a/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/data/enums/SMLAuthenticationType.java b/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/data/enums/SMLAuthenticationType.java
index 0c5802fa0b64a62441d3f67b2943b2d67b7ca634..65e5603a307771f129885326dc4c3fa94e9aad9c 100644
--- a/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/data/enums/SMLAuthenticationType.java
+++ b/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/data/enums/SMLAuthenticationType.java
@@ -2,7 +2,7 @@
* #START_LICENSE#
* smp-server-library
* %%
- * Copyright (C) 2017 - 2023 European Commission | eDelivery | DomiSMP
+ * Copyright (C) 2017 - 2024 European Commission | eDelivery | DomiSMP
* %%
* Licensed under the EUPL, Version 1.2 or – as soon they will be approved by the European Commission - subsequent
* versions of the EUPL (the "Licence");
diff --git a/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/data/enums/VisibilityType.java b/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/data/enums/VisibilityType.java
index 86b2d1eb78985d8fd611b3ba8d957f3173905e0a..eab03e722f44d23a7a8b743f7b2c6ab896a0144e 100644
--- a/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/data/enums/VisibilityType.java
+++ b/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/data/enums/VisibilityType.java
@@ -2,7 +2,7 @@
* #START_LICENSE#
* smp-server-library
* %%
- * Copyright (C) 2017 - 2023 European Commission | eDelivery | DomiSMP
+ * Copyright (C) 2017 - 2024 European Commission | eDelivery | DomiSMP
* %%
* Licensed under the EUPL, Version 1.2 or – as soon they will be approved by the European Commission - subsequent
* versions of the EUPL (the "Licence");
diff --git a/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/data/model/BaseEntity.java b/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/data/model/BaseEntity.java
index 58383871cb6da6970ae2934b85f8b9463dcd839f..4c496a1936d6213945f6a5c957fbdb6326aeffaa 100644
--- a/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/data/model/BaseEntity.java
+++ b/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/data/model/BaseEntity.java
@@ -2,7 +2,7 @@
* #START_LICENSE#
* smp-webapp
* %%
- * Copyright (C) 2017 - 2023 European Commission | eDelivery | DomiSMP
+ * Copyright (C) 2017 - 2024 European Commission | eDelivery | DomiSMP
* %%
* Licensed under the EUPL, Version 1.2 or – as soon they will be approved by the European Commission - subsequent
* versions of the EUPL (the "Licence");
diff --git a/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/data/model/CommonColumnsLengths.java b/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/data/model/CommonColumnsLengths.java
index a3f93e5eb1224903657894bf146fefee640d30ac..21ffc472a4ad03f2210173d2e2ec86765f34ce26 100644
--- a/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/data/model/CommonColumnsLengths.java
+++ b/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/data/model/CommonColumnsLengths.java
@@ -2,7 +2,7 @@
* #START_LICENSE#
* smp-webapp
* %%
- * Copyright (C) 2017 - 2023 European Commission | eDelivery | DomiSMP
+ * Copyright (C) 2017 - 2024 European Commission | eDelivery | DomiSMP
* %%
* Licensed under the EUPL, Version 1.2 or – as soon they will be approved by the European Commission - subsequent
* versions of the EUPL (the "Licence");
diff --git a/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/data/model/DBAlert.java b/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/data/model/DBAlert.java
index b01e5db05716d45a961365a75b360131c973ed56..df2687ef1dfb7c4d1f80a94e9a0706bbf61ea303 100644
--- a/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/data/model/DBAlert.java
+++ b/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/data/model/DBAlert.java
@@ -2,7 +2,7 @@
* #START_LICENSE#
* smp-server-library
* %%
- * Copyright (C) 2017 - 2023 European Commission | eDelivery | DomiSMP
+ * Copyright (C) 2017 - 2024 European Commission | eDelivery | DomiSMP
* %%
* Licensed under the EUPL, Version 1.2 or – as soon they will be approved by the European Commission - subsequent
* versions of the EUPL (the "Licence");
diff --git a/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/data/model/DBAlertProperty.java b/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/data/model/DBAlertProperty.java
index ea6988ebddf5a49bc897e0c0eef8a465f7e212b1..2034ec7f4d4e1162a1ce598d7974065d4b579739 100644
--- a/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/data/model/DBAlertProperty.java
+++ b/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/data/model/DBAlertProperty.java
@@ -2,7 +2,7 @@
* #START_LICENSE#
* smp-server-library
* %%
- * Copyright (C) 2017 - 2023 European Commission | eDelivery | DomiSMP
+ * Copyright (C) 2017 - 2024 European Commission | eDelivery | DomiSMP
* %%
* Licensed under the EUPL, Version 1.2 or – as soon they will be approved by the European Commission - subsequent
* versions of the EUPL (the "Licence");
diff --git a/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/data/model/DBConfiguration.java b/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/data/model/DBConfiguration.java
index 82a54d4d7cfa5ceeb892996ddf8d27e9672be473..3dc51b3be1ca113857f34756c83c6bc66f5c9192 100644
--- a/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/data/model/DBConfiguration.java
+++ b/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/data/model/DBConfiguration.java
@@ -2,7 +2,7 @@
* #START_LICENSE#
* smp-webapp
* %%
- * Copyright (C) 2017 - 2023 European Commission | eDelivery | DomiSMP
+ * Copyright (C) 2017 - 2024 European Commission | eDelivery | DomiSMP
* %%
* Licensed under the EUPL, Version 1.2 or – as soon they will be approved by the European Commission - subsequent
* versions of the EUPL (the "Licence");
diff --git a/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/data/model/DBDomain.java b/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/data/model/DBDomain.java
index 75ff814fee4d7ddc0c3c3effa1357a0e0e0160b3..c826b4c6b7efc6fa8b801a4e1b4811b3284111e9 100644
--- a/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/data/model/DBDomain.java
+++ b/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/data/model/DBDomain.java
@@ -2,7 +2,7 @@
* #START_LICENSE#
* smp-webapp
* %%
- * Copyright (C) 2017 - 2023 European Commission | eDelivery | DomiSMP
+ * Copyright (C) 2017 - 2024 European Commission | eDelivery | DomiSMP
* %%
* Licensed under the EUPL, Version 1.2 or – as soon they will be approved by the European Commission - subsequent
* versions of the EUPL (the "Licence");
diff --git a/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/data/model/DBDomainResourceDef.java b/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/data/model/DBDomainResourceDef.java
index ea23847a33b938a0e1f1ed5578c2da9d0e51e118..5509535498f8f0ad6de75189fde968d2b4ab3925 100644
--- a/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/data/model/DBDomainResourceDef.java
+++ b/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/data/model/DBDomainResourceDef.java
@@ -2,7 +2,7 @@
* #START_LICENSE#
* smp-server-library
* %%
- * Copyright (C) 2017 - 2023 European Commission | eDelivery | DomiSMP
+ * Copyright (C) 2017 - 2024 European Commission | eDelivery | DomiSMP
* %%
* Licensed under the EUPL, Version 1.2 or – as soon they will be approved by the European Commission - subsequent
* versions of the EUPL (the "Licence");
diff --git a/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/data/model/DBGroup.java b/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/data/model/DBGroup.java
index 6363ad4284a35aa6890b6a096b58b17d0528cc37..933e20e77ccc313ea5633672853e8ed6a9552fd4 100644
--- a/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/data/model/DBGroup.java
+++ b/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/data/model/DBGroup.java
@@ -2,7 +2,7 @@
* #START_LICENSE#
* smp-webapp
* %%
- * Copyright (C) 2017 - 2023 European Commission | eDelivery | DomiSMP
+ * Copyright (C) 2017 - 2024 European Commission | eDelivery | DomiSMP
* %%
* Licensed under the EUPL, Version 1.2 or – as soon they will be approved by the European Commission - subsequent
* versions of the EUPL (the "Licence");
diff --git a/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/data/model/DBRevisionLog.java b/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/data/model/DBRevisionLog.java
index 567d784f320d3ce472d33cb7d16fc7f2b7de2d31..bcc968ba264b725a7acb71fce396c603ba90f640 100644
--- a/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/data/model/DBRevisionLog.java
+++ b/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/data/model/DBRevisionLog.java
@@ -2,7 +2,7 @@
* #START_LICENSE#
* smp-server-library
* %%
- * Copyright (C) 2017 - 2023 European Commission | eDelivery | DomiSMP
+ * Copyright (C) 2017 - 2024 European Commission | eDelivery | DomiSMP
* %%
* Licensed under the EUPL, Version 1.2 or – as soon they will be approved by the European Commission - subsequent
* versions of the EUPL (the "Licence");
diff --git a/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/data/model/DBUserDeleteValidation.java b/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/data/model/DBUserDeleteValidation.java
index 862cad708a8d26ce1d3da4d190dcc8e5975d2896..34515c06fc582bb98bb7a781eea9dbde7feaccaa 100644
--- a/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/data/model/DBUserDeleteValidation.java
+++ b/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/data/model/DBUserDeleteValidation.java
@@ -2,7 +2,7 @@
* #START_LICENSE#
* smp-server-library
* %%
- * Copyright (C) 2017 - 2023 European Commission | eDelivery | DomiSMP
+ * Copyright (C) 2017 - 2024 European Commission | eDelivery | DomiSMP
* %%
* Licensed under the EUPL, Version 1.2 or – as soon they will be approved by the European Commission - subsequent
* versions of the EUPL (the "Licence");
diff --git a/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/data/model/doc/DBDocument.java b/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/data/model/doc/DBDocument.java
index f6f268cb555997b5821cff600bf6f7c4e2ceb45e..b4f9dd9db96f8ed20935abc050035a0c0fdeba9f 100644
--- a/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/data/model/doc/DBDocument.java
+++ b/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/data/model/doc/DBDocument.java
@@ -2,7 +2,7 @@
* #START_LICENSE#
* smp-server-library
* %%
- * Copyright (C) 2017 - 2023 European Commission | eDelivery | DomiSMP
+ * Copyright (C) 2017 - 2024 European Commission | eDelivery | DomiSMP
* %%
* Licensed under the EUPL, Version 1.2 or – as soon they will be approved by the European Commission - subsequent
* versions of the EUPL (the "Licence");
diff --git a/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/data/model/doc/DBDocumentVersion.java b/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/data/model/doc/DBDocumentVersion.java
index 5348b641df7060c5d035cd0a6a280ffa753fba89..e03a7b58fdcf75b4e788f6da10bac76a15f04e8b 100644
--- a/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/data/model/doc/DBDocumentVersion.java
+++ b/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/data/model/doc/DBDocumentVersion.java
@@ -2,7 +2,7 @@
* #START_LICENSE#
* smp-server-library
* %%
- * Copyright (C) 2017 - 2023 European Commission | eDelivery | DomiSMP
+ * Copyright (C) 2017 - 2024 European Commission | eDelivery | DomiSMP
* %%
* Licensed under the EUPL, Version 1.2 or – as soon they will be approved by the European Commission - subsequent
* versions of the EUPL (the "Licence");
diff --git a/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/data/model/doc/DBResource.java b/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/data/model/doc/DBResource.java
index 90195c8615bff6d384217f02d835ed1310c78bab..34c01df66b259af7a2c23ddc272fb44d2505966d 100644
--- a/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/data/model/doc/DBResource.java
+++ b/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/data/model/doc/DBResource.java
@@ -2,7 +2,7 @@
* #START_LICENSE#
* smp-webapp
* %%
- * Copyright (C) 2017 - 2023 European Commission | eDelivery | DomiSMP
+ * Copyright (C) 2017 - 2024 European Commission | eDelivery | DomiSMP
* %%
* Licensed under the EUPL, Version 1.2 or – as soon they will be approved by the European Commission - subsequent
* versions of the EUPL (the "Licence");
diff --git a/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/data/model/doc/DBResourceFilter.java b/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/data/model/doc/DBResourceFilter.java
index ddc62892fa4472a387533c1787d175bddae690ee..e0738d6b067bcc4049563ecd3a9a90e53c41e452 100644
--- a/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/data/model/doc/DBResourceFilter.java
+++ b/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/data/model/doc/DBResourceFilter.java
@@ -2,7 +2,7 @@
* #START_LICENSE#
* smp-server-library
* %%
- * Copyright (C) 2017 - 2023 European Commission | eDelivery | DomiSMP
+ * Copyright (C) 2017 - 2024 European Commission | eDelivery | DomiSMP
* %%
* Licensed under the EUPL, Version 1.2 or – as soon they will be approved by the European Commission - subsequent
* versions of the EUPL (the "Licence");
diff --git a/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/data/model/doc/DBSubresource.java b/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/data/model/doc/DBSubresource.java
index dfdec6baf0c0652de85433be3cb3886200855df0..05b9abae8b69e1599e1e1de55df0c227c4ecae9c 100644
--- a/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/data/model/doc/DBSubresource.java
+++ b/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/data/model/doc/DBSubresource.java
@@ -2,7 +2,7 @@
* #START_LICENSE#
* smp-webapp
* %%
- * Copyright (C) 2017 - 2023 European Commission | eDelivery | DomiSMP
+ * Copyright (C) 2017 - 2024 European Commission | eDelivery | DomiSMP
* %%
* Licensed under the EUPL, Version 1.2 or – as soon they will be approved by the European Commission - subsequent
* versions of the EUPL (the "Licence");
@@ -121,7 +121,6 @@ public class DBSubresource extends BaseEntity {
}
@Transient
-
public DBResource getResource() {
return resource;
}
@@ -134,10 +133,6 @@ public class DBSubresource extends BaseEntity {
return document;
}
- public byte[] getCurrentContent() {
- return getCurrentContent();
- }
-
public void setDocument(DBDocument document) {
this.document = document;
}
diff --git a/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/data/model/ext/DBExtension.java b/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/data/model/ext/DBExtension.java
index 50869c2901b5ffb03f3c766b637dec3f10feadb5..ab596200a43af59104856f1ad70b281590d8ae3f 100644
--- a/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/data/model/ext/DBExtension.java
+++ b/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/data/model/ext/DBExtension.java
@@ -2,7 +2,7 @@
* #START_LICENSE#
* smp-server-library
* %%
- * Copyright (C) 2017 - 2023 European Commission | eDelivery | DomiSMP
+ * Copyright (C) 2017 - 2024 European Commission | eDelivery | DomiSMP
* %%
* Licensed under the EUPL, Version 1.2 or – as soon they will be approved by the European Commission - subsequent
* versions of the EUPL (the "Licence");
diff --git a/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/data/model/ext/DBResourceDef.java b/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/data/model/ext/DBResourceDef.java
index 0f02fa5e0bc214d4eac4dae6d75da450900842f8..74fa363fb7827b9ac7f5b603c685dd6f0996772f 100644
--- a/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/data/model/ext/DBResourceDef.java
+++ b/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/data/model/ext/DBResourceDef.java
@@ -2,7 +2,7 @@
* #START_LICENSE#
* smp-server-library
* %%
- * Copyright (C) 2017 - 2023 European Commission | eDelivery | DomiSMP
+ * Copyright (C) 2017 - 2024 European Commission | eDelivery | DomiSMP
* %%
* Licensed under the EUPL, Version 1.2 or – as soon they will be approved by the European Commission - subsequent
* versions of the EUPL (the "Licence");
diff --git a/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/data/model/ext/DBSubresourceDef.java b/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/data/model/ext/DBSubresourceDef.java
index 7759554b55af3013a3ab1cc8def3920f7f6ee1fd..d25ff836c28e4d33cd386fa5da7c351b51a66000 100644
--- a/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/data/model/ext/DBSubresourceDef.java
+++ b/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/data/model/ext/DBSubresourceDef.java
@@ -2,7 +2,7 @@
* #START_LICENSE#
* smp-server-library
* %%
- * Copyright (C) 2017 - 2023 European Commission | eDelivery | DomiSMP
+ * Copyright (C) 2017 - 2024 European Commission | eDelivery | DomiSMP
* %%
* Licensed under the EUPL, Version 1.2 or – as soon they will be approved by the European Commission - subsequent
* versions of the EUPL (the "Licence");
diff --git a/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/data/model/user/DBCertificate.java b/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/data/model/user/DBCertificate.java
index 26b3c2d7bbc121d64146c83e40f596e5d9910381..2449705931591720c0c9f83b2b18d51940f4b059 100644
--- a/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/data/model/user/DBCertificate.java
+++ b/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/data/model/user/DBCertificate.java
@@ -2,7 +2,7 @@
* #START_LICENSE#
* smp-webapp
* %%
- * Copyright (C) 2017 - 2023 European Commission | eDelivery | DomiSMP
+ * Copyright (C) 2017 - 2024 European Commission | eDelivery | DomiSMP
* %%
* Licensed under the EUPL, Version 1.2 or – as soon they will be approved by the European Commission - subsequent
* versions of the EUPL (the "Licence");
diff --git a/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/data/model/user/DBCredential.java b/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/data/model/user/DBCredential.java
index 26676e46d4ed69133a0d0993e97ab7b3d77595fb..9b7fb456088dafaf30bfc5ea9a23473d324c10c1 100644
--- a/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/data/model/user/DBCredential.java
+++ b/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/data/model/user/DBCredential.java
@@ -2,7 +2,7 @@
* #START_LICENSE#
* smp-webapp
* %%
- * Copyright (C) 2017 - 2023 European Commission | eDelivery | DomiSMP
+ * Copyright (C) 2017 - 2024 European Commission | eDelivery | DomiSMP
* %%
* Licensed under the EUPL, Version 1.2 or – as soon they will be approved by the European Commission - subsequent
* versions of the EUPL (the "Licence");
diff --git a/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/data/model/user/DBDomainMember.java b/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/data/model/user/DBDomainMember.java
index e72423dcf08ee9ce1dca6fc8cc06025b8bbf0389..1ac445df3a532458cd9a51b47edf9400c3c6f528 100644
--- a/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/data/model/user/DBDomainMember.java
+++ b/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/data/model/user/DBDomainMember.java
@@ -2,7 +2,7 @@
* #START_LICENSE#
* smp-server-library
* %%
- * Copyright (C) 2017 - 2023 European Commission | eDelivery | DomiSMP
+ * Copyright (C) 2017 - 2024 European Commission | eDelivery | DomiSMP
* %%
* Licensed under the EUPL, Version 1.2 or – as soon they will be approved by the European Commission - subsequent
* versions of the EUPL (the "Licence");
diff --git a/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/data/model/user/DBGroupMember.java b/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/data/model/user/DBGroupMember.java
index 8569500247d0ddc0b7d29b7389f7d76803cd22d0..e30ab5cd46864ae60e24e527502e0a255a591f5d 100644
--- a/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/data/model/user/DBGroupMember.java
+++ b/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/data/model/user/DBGroupMember.java
@@ -2,7 +2,7 @@
* #START_LICENSE#
* smp-server-library
* %%
- * Copyright (C) 2017 - 2023 European Commission | eDelivery | DomiSMP
+ * Copyright (C) 2017 - 2024 European Commission | eDelivery | DomiSMP
* %%
* Licensed under the EUPL, Version 1.2 or – as soon they will be approved by the European Commission - subsequent
* versions of the EUPL (the "Licence");
diff --git a/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/data/model/user/DBResourceMember.java b/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/data/model/user/DBResourceMember.java
index 0f8b2257cebd1aedbf33538ea3c530158edefbf0..ad1cd56f7c7bec3644f0109f485366cc21433fc9 100644
--- a/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/data/model/user/DBResourceMember.java
+++ b/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/data/model/user/DBResourceMember.java
@@ -2,7 +2,7 @@
* #START_LICENSE#
* smp-server-library
* %%
- * Copyright (C) 2017 - 2023 European Commission | eDelivery | DomiSMP
+ * Copyright (C) 2017 - 2024 European Commission | eDelivery | DomiSMP
* %%
* Licensed under the EUPL, Version 1.2 or – as soon they will be approved by the European Commission - subsequent
* versions of the EUPL (the "Licence");
diff --git a/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/data/model/user/DBUser.java b/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/data/model/user/DBUser.java
index ef81632e5a7e8e733cd46e0e342f739f09fb75c3..ab0d3831b39e06eabf1a230b8c13404e02b29bb4 100644
--- a/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/data/model/user/DBUser.java
+++ b/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/data/model/user/DBUser.java
@@ -2,7 +2,7 @@
* #START_LICENSE#
* smp-webapp
* %%
- * Copyright (C) 2017 - 2023 European Commission | eDelivery | DomiSMP
+ * Copyright (C) 2017 - 2024 European Commission | eDelivery | DomiSMP
* %%
* Licensed under the EUPL, Version 1.2 or – as soon they will be approved by the European Commission - subsequent
* versions of the EUPL (the "Licence");
diff --git a/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/data/ui/AccessTokenRO.java b/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/data/ui/AccessTokenRO.java
index 90a713c99f689f126f0cb1a5c9ace918963a226b..9d77690f0b0c95dfc80b1c362e2338575f9a70ab 100644
--- a/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/data/ui/AccessTokenRO.java
+++ b/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/data/ui/AccessTokenRO.java
@@ -2,7 +2,7 @@
* #START_LICENSE#
* smp-server-library
* %%
- * Copyright (C) 2017 - 2023 European Commission | eDelivery | DomiSMP
+ * Copyright (C) 2017 - 2024 European Commission | eDelivery | DomiSMP
* %%
* Licensed under the EUPL, Version 1.2 or – as soon they will be approved by the European Commission - subsequent
* versions of the EUPL (the "Licence");
diff --git a/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/data/ui/AlertRO.java b/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/data/ui/AlertRO.java
index bc1b6be998d9dad5e0bdf33cf6405f1a8df9c13e..e64775dc026afa470c8b1c19bc65a0e564d330df 100644
--- a/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/data/ui/AlertRO.java
+++ b/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/data/ui/AlertRO.java
@@ -2,7 +2,7 @@
* #START_LICENSE#
* smp-server-library
* %%
- * Copyright (C) 2017 - 2023 European Commission | eDelivery | DomiSMP
+ * Copyright (C) 2017 - 2024 European Commission | eDelivery | DomiSMP
* %%
* Licensed under the EUPL, Version 1.2 or – as soon they will be approved by the European Commission - subsequent
* versions of the EUPL (the "Licence");
diff --git a/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/data/ui/BaseRO.java b/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/data/ui/BaseRO.java
index 2c00e2cc1e086091fb352ca88a890806ffc8146d..e4880bed8da6af4a211b044d3e4c2246686f0588 100644
--- a/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/data/ui/BaseRO.java
+++ b/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/data/ui/BaseRO.java
@@ -2,7 +2,7 @@
* #START_LICENSE#
* smp-server-library
* %%
- * Copyright (C) 2017 - 2023 European Commission | eDelivery | DomiSMP
+ * Copyright (C) 2017 - 2024 European Commission | eDelivery | DomiSMP
* %%
* Licensed under the EUPL, Version 1.2 or – as soon they will be approved by the European Commission - subsequent
* versions of the EUPL (the "Licence");
diff --git a/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/data/ui/CertificateRO.java b/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/data/ui/CertificateRO.java
index 8130605c832ad5a040f7f85586e1c817d5fa6d34..780fd209c1b678ec66280e5dfe4707e8e3a5ff27 100644
--- a/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/data/ui/CertificateRO.java
+++ b/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/data/ui/CertificateRO.java
@@ -2,7 +2,7 @@
* #START_LICENSE#
* smp-server-library
* %%
- * Copyright (C) 2017 - 2023 European Commission | eDelivery | DomiSMP
+ * Copyright (C) 2017 - 2024 European Commission | eDelivery | DomiSMP
* %%
* Licensed under the EUPL, Version 1.2 or – as soon they will be approved by the European Commission - subsequent
* versions of the EUPL (the "Licence");
diff --git a/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/data/ui/CredentialRO.java b/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/data/ui/CredentialRO.java
index 3f4c806d786245928f1ab4d36b5a272b768e072f..33d278cc2f56defcd3fc17f0bf055439bfb439d2 100644
--- a/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/data/ui/CredentialRO.java
+++ b/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/data/ui/CredentialRO.java
@@ -2,7 +2,7 @@
* #START_LICENSE#
* smp-server-library
* %%
- * Copyright (C) 2017 - 2023 European Commission | eDelivery | DomiSMP
+ * Copyright (C) 2017 - 2024 European Commission | eDelivery | DomiSMP
* %%
* Licensed under the EUPL, Version 1.2 or – as soon they will be approved by the European Commission - subsequent
* versions of the EUPL (the "Licence");
diff --git a/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/data/ui/CredentialRequestResetRO.java b/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/data/ui/CredentialRequestResetRO.java
index 1082b4f441def5d43e80a8f8fac08568c0792ffb..e58319e8f248931df8bccd159feaee0871a3b2bd 100644
--- a/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/data/ui/CredentialRequestResetRO.java
+++ b/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/data/ui/CredentialRequestResetRO.java
@@ -2,7 +2,7 @@
* #START_LICENSE#
* smp-server-library
* %%
- * Copyright (C) 2017 - 2023 European Commission | eDelivery | DomiSMP
+ * Copyright (C) 2017 - 2024 European Commission | eDelivery | DomiSMP
* %%
* Licensed under the EUPL, Version 1.2 or – as soon they will be approved by the European Commission - subsequent
* versions of the EUPL (the "Licence");
diff --git a/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/data/ui/CredentialResetRO.java b/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/data/ui/CredentialResetRO.java
index 6d85e8a40fc5ccb835ef611567467943c926b654..79cf65e34941f9a9380248c429d61faf7cb326f4 100644
--- a/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/data/ui/CredentialResetRO.java
+++ b/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/data/ui/CredentialResetRO.java
@@ -2,7 +2,7 @@
* #START_LICENSE#
* smp-server-library
* %%
- * Copyright (C) 2017 - 2023 European Commission | eDelivery | DomiSMP
+ * Copyright (C) 2017 - 2024 European Commission | eDelivery | DomiSMP
* %%
* Licensed under the EUPL, Version 1.2 or – as soon they will be approved by the European Commission - subsequent
* versions of the EUPL (the "Licence");
diff --git a/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/data/ui/DeleteEntityValidation.java b/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/data/ui/DeleteEntityValidation.java
index 39f5163622ed59c1c091be70b03d4f22b53d50a6..a6f51814e5cfd6e0a3e54f36094bb11dca2b7af6 100644
--- a/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/data/ui/DeleteEntityValidation.java
+++ b/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/data/ui/DeleteEntityValidation.java
@@ -2,7 +2,7 @@
* #START_LICENSE#
* smp-server-library
* %%
- * Copyright (C) 2017 - 2023 European Commission | eDelivery | DomiSMP
+ * Copyright (C) 2017 - 2024 European Commission | eDelivery | DomiSMP
* %%
* Licensed under the EUPL, Version 1.2 or – as soon they will be approved by the European Commission - subsequent
* versions of the EUPL (the "Licence");
diff --git a/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/data/ui/DocumentRo.java b/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/data/ui/DocumentRo.java
index cdba83b1b960615d019543319b2c7c75374dd1e1..8152c4183d43cca711ed22790ea305b319eb273f 100644
--- a/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/data/ui/DocumentRo.java
+++ b/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/data/ui/DocumentRo.java
@@ -2,7 +2,7 @@
* #START_LICENSE#
* smp-server-library
* %%
- * Copyright (C) 2017 - 2023 European Commission | eDelivery | DomiSMP
+ * Copyright (C) 2017 - 2024 European Commission | eDelivery | DomiSMP
* %%
* Licensed under the EUPL, Version 1.2 or – as soon they will be approved by the European Commission - subsequent
* versions of the EUPL (the "Licence");
diff --git a/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/data/ui/DomainPublicRO.java b/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/data/ui/DomainPublicRO.java
index d78d86758bccb2c3671ed9178d8b3fbcdaf34f1e..73cb52ccc8af8fdcac9c5fa1a7e0e48820707216 100644
--- a/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/data/ui/DomainPublicRO.java
+++ b/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/data/ui/DomainPublicRO.java
@@ -2,7 +2,7 @@
* #START_LICENSE#
* smp-server-library
* %%
- * Copyright (C) 2017 - 2023 European Commission | eDelivery | DomiSMP
+ * Copyright (C) 2017 - 2024 European Commission | eDelivery | DomiSMP
* %%
* Licensed under the EUPL, Version 1.2 or – as soon they will be approved by the European Commission - subsequent
* versions of the EUPL (the "Licence");
diff --git a/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/data/ui/DomainRO.java b/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/data/ui/DomainRO.java
index cebd64912465b99898e24cabd77ead0cab05b471..97bddd7ef86ee92a798f6e6040006fb9f8c7a658 100644
--- a/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/data/ui/DomainRO.java
+++ b/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/data/ui/DomainRO.java
@@ -2,7 +2,7 @@
* #START_LICENSE#
* smp-server-library
* %%
- * Copyright (C) 2017 - 2023 European Commission | eDelivery | DomiSMP
+ * Copyright (C) 2017 - 2024 European Commission | eDelivery | DomiSMP
* %%
* Licensed under the EUPL, Version 1.2 or – as soon they will be approved by the European Commission - subsequent
* versions of the EUPL (the "Licence");
diff --git a/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/data/ui/DomainResourceDefinitionRO.java b/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/data/ui/DomainResourceDefinitionRO.java
index d5f0efccca95f784e76cf770c5ef15a6a923b222..ea578de643d8809083fee132673fcfdd6af7dd86 100644
--- a/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/data/ui/DomainResourceDefinitionRO.java
+++ b/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/data/ui/DomainResourceDefinitionRO.java
@@ -2,7 +2,7 @@
* #START_LICENSE#
* smp-server-library
* %%
- * Copyright (C) 2017 - 2023 European Commission | eDelivery | DomiSMP
+ * Copyright (C) 2017 - 2024 European Commission | eDelivery | DomiSMP
* %%
* Licensed under the EUPL, Version 1.2 or – as soon they will be approved by the European Commission - subsequent
* versions of the EUPL (the "Licence");
diff --git a/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/data/ui/ExtensionRO.java b/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/data/ui/ExtensionRO.java
index 5a7ac18fd7a5e581b6059385ae5da9d881da89b2..8bb3148a53f09250f76db6d8586a3c0326915ff8 100644
--- a/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/data/ui/ExtensionRO.java
+++ b/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/data/ui/ExtensionRO.java
@@ -2,7 +2,7 @@
* #START_LICENSE#
* smp-server-library
* %%
- * Copyright (C) 2017 - 2023 European Commission | eDelivery | DomiSMP
+ * Copyright (C) 2017 - 2024 European Commission | eDelivery | DomiSMP
* %%
* Licensed under the EUPL, Version 1.2 or – as soon they will be approved by the European Commission - subsequent
* versions of the EUPL (the "Licence");
diff --git a/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/data/ui/GroupRO.java b/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/data/ui/GroupRO.java
index 71a90f98dae350e95e2b92fb236b2061f1c2534c..fc16c1d15daf701abe115c54ce021efe63f8ff37 100644
--- a/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/data/ui/GroupRO.java
+++ b/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/data/ui/GroupRO.java
@@ -2,7 +2,7 @@
* #START_LICENSE#
* smp-webapp
* %%
- * Copyright (C) 2017 - 2023 European Commission | eDelivery | DomiSMP
+ * Copyright (C) 2017 - 2024 European Commission | eDelivery | DomiSMP
* %%
* Licensed under the EUPL, Version 1.2 or – as soon they will be approved by the European Commission - subsequent
* versions of the EUPL (the "Licence");
diff --git a/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/data/ui/KeystoreImportResult.java b/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/data/ui/KeystoreImportResult.java
index 18c0412b5aa6a2143a9edcc9f9a3cd3281c2489a..d59d18d0f5a604081421b562de81becb8b7de8a8 100644
--- a/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/data/ui/KeystoreImportResult.java
+++ b/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/data/ui/KeystoreImportResult.java
@@ -2,7 +2,7 @@
* #START_LICENSE#
* smp-server-library
* %%
- * Copyright (C) 2017 - 2023 European Commission | eDelivery | DomiSMP
+ * Copyright (C) 2017 - 2024 European Commission | eDelivery | DomiSMP
* %%
* Licensed under the EUPL, Version 1.2 or – as soon they will be approved by the European Commission - subsequent
* versions of the EUPL (the "Licence");
diff --git a/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/data/ui/LoginRO.java b/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/data/ui/LoginRO.java
index 4bcde9f6659991b5893fa206f7ce92db93a2d705..8041338f246b4f4decc54edb870d6d22eb447712 100644
--- a/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/data/ui/LoginRO.java
+++ b/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/data/ui/LoginRO.java
@@ -2,7 +2,7 @@
* #START_LICENSE#
* smp-server-library
* %%
- * Copyright (C) 2017 - 2023 European Commission | eDelivery | DomiSMP
+ * Copyright (C) 2017 - 2024 European Commission | eDelivery | DomiSMP
* %%
* Licensed under the EUPL, Version 1.2 or – as soon they will be approved by the European Commission - subsequent
* versions of the EUPL (the "Licence");
diff --git a/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/data/ui/MemberRO.java b/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/data/ui/MemberRO.java
index 231c75889a393eb01a77b3482be73b951cd6aecd..9fca55e6ff693c02840ca0151a4514f99fc6b769 100644
--- a/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/data/ui/MemberRO.java
+++ b/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/data/ui/MemberRO.java
@@ -2,7 +2,7 @@
* #START_LICENSE#
* smp-server-library
* %%
- * Copyright (C) 2017 - 2023 European Commission | eDelivery | DomiSMP
+ * Copyright (C) 2017 - 2024 European Commission | eDelivery | DomiSMP
* %%
* Licensed under the EUPL, Version 1.2 or – as soon they will be approved by the European Commission - subsequent
* versions of the EUPL (the "Licence");
diff --git a/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/data/ui/NavigationTreeNodeRO.java b/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/data/ui/NavigationTreeNodeRO.java
index 21ac72320b8c039bcf4a2ce7ee324ee0cf0ec77d..10089662568fca58361576fc4dbb849cc2d6d317 100644
--- a/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/data/ui/NavigationTreeNodeRO.java
+++ b/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/data/ui/NavigationTreeNodeRO.java
@@ -2,7 +2,7 @@
* #START_LICENSE#
* smp-server-library
* %%
- * Copyright (C) 2017 - 2023 European Commission | eDelivery | DomiSMP
+ * Copyright (C) 2017 - 2024 European Commission | eDelivery | DomiSMP
* %%
* Licensed under the EUPL, Version 1.2 or – as soon they will be approved by the European Commission - subsequent
* versions of the EUPL (the "Licence");
diff --git a/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/data/ui/PasswordChangeRO.java b/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/data/ui/PasswordChangeRO.java
index ad1079d8127b675e28de9adfa191982d45d74169..e78637e2d3ed1840052e785cf7883ce4144d680d 100644
--- a/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/data/ui/PasswordChangeRO.java
+++ b/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/data/ui/PasswordChangeRO.java
@@ -2,7 +2,7 @@
* #START_LICENSE#
* smp-server-library
* %%
- * Copyright (C) 2017 - 2023 European Commission | eDelivery | DomiSMP
+ * Copyright (C) 2017 - 2024 European Commission | eDelivery | DomiSMP
* %%
* Licensed under the EUPL, Version 1.2 or – as soon they will be approved by the European Commission - subsequent
* versions of the EUPL (the "Licence");
diff --git a/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/data/ui/PropertyRO.java b/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/data/ui/PropertyRO.java
index 6a421ee87b04e195a37f673559aff953925c5f5d..1e5492d4d7ece48ea5c3ef27151d3d7a006b6ce0 100644
--- a/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/data/ui/PropertyRO.java
+++ b/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/data/ui/PropertyRO.java
@@ -2,7 +2,7 @@
* #START_LICENSE#
* smp-server-library
* %%
- * Copyright (C) 2017 - 2023 European Commission | eDelivery | DomiSMP
+ * Copyright (C) 2017 - 2024 European Commission | eDelivery | DomiSMP
* %%
* Licensed under the EUPL, Version 1.2 or – as soon they will be approved by the European Commission - subsequent
* versions of the EUPL (the "Licence");
diff --git a/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/data/ui/PropertyValidationRO.java b/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/data/ui/PropertyValidationRO.java
index 5bc1affa051efd4318e463c93322ed3f843f441a..1dbca2b7f2487c92e461ad0f0980464f47bfcb85 100644
--- a/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/data/ui/PropertyValidationRO.java
+++ b/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/data/ui/PropertyValidationRO.java
@@ -2,7 +2,7 @@
* #START_LICENSE#
* smp-server-library
* %%
- * Copyright (C) 2017 - 2023 European Commission | eDelivery | DomiSMP
+ * Copyright (C) 2017 - 2024 European Commission | eDelivery | DomiSMP
* %%
* Licensed under the EUPL, Version 1.2 or – as soon they will be approved by the European Commission - subsequent
* versions of the EUPL (the "Licence");
diff --git a/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/data/ui/ResourceDefinitionRO.java b/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/data/ui/ResourceDefinitionRO.java
index 8a99914cd3cfdd199ab88a3b5c5d8823239746b4..f34707c1925e7d1cba9a9009fc458efda96bdae6 100644
--- a/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/data/ui/ResourceDefinitionRO.java
+++ b/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/data/ui/ResourceDefinitionRO.java
@@ -2,7 +2,7 @@
* #START_LICENSE#
* smp-server-library
* %%
- * Copyright (C) 2017 - 2023 European Commission | eDelivery | DomiSMP
+ * Copyright (C) 2017 - 2024 European Commission | eDelivery | DomiSMP
* %%
* Licensed under the EUPL, Version 1.2 or – as soon they will be approved by the European Commission - subsequent
* versions of the EUPL (the "Licence");
diff --git a/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/data/ui/ResourceRO.java b/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/data/ui/ResourceRO.java
index 955142b7a8e114a88f7ec6726a97d741b6a70a39..5a91b3834385bd01cd80a2da30e6370580bc3395 100644
--- a/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/data/ui/ResourceRO.java
+++ b/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/data/ui/ResourceRO.java
@@ -2,7 +2,7 @@
* #START_LICENSE#
* smp-server-library
* %%
- * Copyright (C) 2017 - 2023 European Commission | eDelivery | DomiSMP
+ * Copyright (C) 2017 - 2024 European Commission | eDelivery | DomiSMP
* %%
* Licensed under the EUPL, Version 1.2 or – as soon they will be approved by the European Commission - subsequent
* versions of the EUPL (the "Licence");
diff --git a/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/data/ui/SMLIntegrationResult.java b/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/data/ui/SMLIntegrationResult.java
index 478f3752200314232a8e284898682d5f952bdf9b..b66e6a2e0af85a2bb7b951266af271853ab4f73c 100644
--- a/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/data/ui/SMLIntegrationResult.java
+++ b/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/data/ui/SMLIntegrationResult.java
@@ -2,7 +2,7 @@
* #START_LICENSE#
* smp-server-library
* %%
- * Copyright (C) 2017 - 2023 European Commission | eDelivery | DomiSMP
+ * Copyright (C) 2017 - 2024 European Commission | eDelivery | DomiSMP
* %%
* Licensed under the EUPL, Version 1.2 or – as soon they will be approved by the European Commission - subsequent
* versions of the EUPL (the "Licence");
diff --git a/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/data/ui/SearchUserRO.java b/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/data/ui/SearchUserRO.java
index b9cb95ec89d4a661c13acb22aa77a0ff743fa0af..8d00ea6036672b3f4fbb9bc0c97987e21106d05f 100644
--- a/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/data/ui/SearchUserRO.java
+++ b/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/data/ui/SearchUserRO.java
@@ -2,7 +2,7 @@
* #START_LICENSE#
* smp-server-library
* %%
- * Copyright (C) 2017 - 2023 European Commission | eDelivery | DomiSMP
+ * Copyright (C) 2017 - 2024 European Commission | eDelivery | DomiSMP
* %%
* Licensed under the EUPL, Version 1.2 or – as soon they will be approved by the European Commission - subsequent
* versions of the EUPL (the "Licence");
diff --git a/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/data/ui/ServiceGroupSearchRO.java b/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/data/ui/ServiceGroupSearchRO.java
index abd686b4633e569d2bd57c58607b2c7db384b74b..cdf665c99c48dbd8084752d22fa950d6eda06c96 100644
--- a/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/data/ui/ServiceGroupSearchRO.java
+++ b/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/data/ui/ServiceGroupSearchRO.java
@@ -2,7 +2,7 @@
* #START_LICENSE#
* smp-server-library
* %%
- * Copyright (C) 2017 - 2023 European Commission | eDelivery | DomiSMP
+ * Copyright (C) 2017 - 2024 European Commission | eDelivery | DomiSMP
* %%
* Licensed under the EUPL, Version 1.2 or – as soon they will be approved by the European Commission - subsequent
* versions of the EUPL (the "Licence");
diff --git a/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/data/ui/ServiceMetadataRO.java b/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/data/ui/ServiceMetadataRO.java
index 685001402c4ee7585fc4c556d64a0edee4508965..492c41848f04363a873ddcf19cba0aa4527d1479 100644
--- a/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/data/ui/ServiceMetadataRO.java
+++ b/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/data/ui/ServiceMetadataRO.java
@@ -2,7 +2,7 @@
* #START_LICENSE#
* smp-server-library
* %%
- * Copyright (C) 2017 - 2023 European Commission | eDelivery | DomiSMP
+ * Copyright (C) 2017 - 2024 European Commission | eDelivery | DomiSMP
* %%
* Licensed under the EUPL, Version 1.2 or – as soon they will be approved by the European Commission - subsequent
* versions of the EUPL (the "Licence");
diff --git a/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/data/ui/ServiceResult.java b/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/data/ui/ServiceResult.java
index aba41719ef871fb8fe5f5616dec55255416f00a0..739cf757ac7af84f433a1445cbd3227f88df1f27 100644
--- a/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/data/ui/ServiceResult.java
+++ b/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/data/ui/ServiceResult.java
@@ -2,7 +2,7 @@
* #START_LICENSE#
* smp-server-library
* %%
- * Copyright (C) 2017 - 2023 European Commission | eDelivery | DomiSMP
+ * Copyright (C) 2017 - 2024 European Commission | eDelivery | DomiSMP
* %%
* Licensed under the EUPL, Version 1.2 or – as soon they will be approved by the European Commission - subsequent
* versions of the EUPL (the "Licence");
diff --git a/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/data/ui/ServiceResultProperties.java b/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/data/ui/ServiceResultProperties.java
index 23678482f5b7b4670565d5d0b0fde2e1165514f6..7e2d09ad9f70aca14552ead9980210bb5cf089e0 100644
--- a/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/data/ui/ServiceResultProperties.java
+++ b/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/data/ui/ServiceResultProperties.java
@@ -2,7 +2,7 @@
* #START_LICENSE#
* smp-server-library
* %%
- * Copyright (C) 2017 - 2023 European Commission | eDelivery | DomiSMP
+ * Copyright (C) 2017 - 2024 European Commission | eDelivery | DomiSMP
* %%
* Licensed under the EUPL, Version 1.2 or – as soon they will be approved by the European Commission - subsequent
* versions of the EUPL (the "Licence");
diff --git a/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/data/ui/SmpConfigRO.java b/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/data/ui/SmpConfigRO.java
index 11271094cd516b33b85acaa6ad77f85a5e2cb638..166b7ecc05cd33aad6bd8af313dcfffeefdb1662 100644
--- a/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/data/ui/SmpConfigRO.java
+++ b/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/data/ui/SmpConfigRO.java
@@ -2,7 +2,7 @@
* #START_LICENSE#
* smp-server-library
* %%
- * Copyright (C) 2017 - 2023 European Commission | eDelivery | DomiSMP
+ * Copyright (C) 2017 - 2024 European Commission | eDelivery | DomiSMP
* %%
* Licensed under the EUPL, Version 1.2 or – as soon they will be approved by the European Commission - subsequent
* versions of the EUPL (the "Licence");
diff --git a/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/data/ui/SmpInfoRO.java b/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/data/ui/SmpInfoRO.java
index 1fcb6fc51f2f0e455ad1c18c4132aaaca4e7ccf5..6ee2db5f0a33705b2ba26b3566abb9be69dff23f 100644
--- a/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/data/ui/SmpInfoRO.java
+++ b/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/data/ui/SmpInfoRO.java
@@ -2,7 +2,7 @@
* #START_LICENSE#
* smp-server-library
* %%
- * Copyright (C) 2017 - 2023 European Commission | eDelivery | DomiSMP
+ * Copyright (C) 2017 - 2024 European Commission | eDelivery | DomiSMP
* %%
* Licensed under the EUPL, Version 1.2 or – as soon they will be approved by the European Commission - subsequent
* versions of the EUPL (the "Licence");
diff --git a/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/data/ui/SubresourceDefinitionRO.java b/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/data/ui/SubresourceDefinitionRO.java
index 99bdb40eb04ed7e20edd6533ae0a97fc9d86d641..68628939fede09bcad5b6fb97d5f6814f4891c09 100644
--- a/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/data/ui/SubresourceDefinitionRO.java
+++ b/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/data/ui/SubresourceDefinitionRO.java
@@ -2,7 +2,7 @@
* #START_LICENSE#
* smp-server-library
* %%
- * Copyright (C) 2017 - 2023 European Commission | eDelivery | DomiSMP
+ * Copyright (C) 2017 - 2024 European Commission | eDelivery | DomiSMP
* %%
* Licensed under the EUPL, Version 1.2 or – as soon they will be approved by the European Commission - subsequent
* versions of the EUPL (the "Licence");
diff --git a/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/data/ui/SubresourceRO.java b/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/data/ui/SubresourceRO.java
index 507a379efe5f23d2511a3e4537d74745f9417d1a..a65027f48d37ba34944d510c8825551ffd498ab8 100644
--- a/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/data/ui/SubresourceRO.java
+++ b/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/data/ui/SubresourceRO.java
@@ -2,7 +2,7 @@
* #START_LICENSE#
* smp-server-library
* %%
- * Copyright (C) 2017 - 2023 European Commission | eDelivery | DomiSMP
+ * Copyright (C) 2017 - 2024 European Commission | eDelivery | DomiSMP
* %%
* Licensed under the EUPL, Version 1.2 or – as soon they will be approved by the European Commission - subsequent
* versions of the EUPL (the "Licence");
diff --git a/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/data/ui/UserRO.java b/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/data/ui/UserRO.java
index d433c54d0a474a5afb7d23987454e644be42ee57..60c05f24f38420a4ffe39dee0c59341cc1d03444 100644
--- a/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/data/ui/UserRO.java
+++ b/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/data/ui/UserRO.java
@@ -2,7 +2,7 @@
* #START_LICENSE#
* smp-server-library
* %%
- * Copyright (C) 2017 - 2023 European Commission | eDelivery | DomiSMP
+ * Copyright (C) 2017 - 2024 European Commission | eDelivery | DomiSMP
* %%
* Licensed under the EUPL, Version 1.2 or – as soon they will be approved by the European Commission - subsequent
* versions of the EUPL (the "Licence");
diff --git a/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/data/ui/auth/SMPAuthority.java b/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/data/ui/auth/SMPAuthority.java
index 2a9324724e7176d8fe3aec3a9b5f0ee16b9dfaec..b6bfeb203ebc51093776a1c55a7bfc25e66292b7 100644
--- a/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/data/ui/auth/SMPAuthority.java
+++ b/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/data/ui/auth/SMPAuthority.java
@@ -2,7 +2,7 @@
* #START_LICENSE#
* smp-server-library
* %%
- * Copyright (C) 2017 - 2023 European Commission | eDelivery | DomiSMP
+ * Copyright (C) 2017 - 2024 European Commission | eDelivery | DomiSMP
* %%
* Licensed under the EUPL, Version 1.2 or – as soon they will be approved by the European Commission - subsequent
* versions of the EUPL (the "Licence");
diff --git a/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/data/ui/auth/SMPRole.java b/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/data/ui/auth/SMPRole.java
index 887cfd24a5daca33290b461b56a221cab75a7a00..ddb0f22193279f31451fc1fd2858800afdea0d4a 100644
--- a/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/data/ui/auth/SMPRole.java
+++ b/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/data/ui/auth/SMPRole.java
@@ -2,7 +2,7 @@
* #START_LICENSE#
* smp-server-library
* %%
- * Copyright (C) 2017 - 2023 European Commission | eDelivery | DomiSMP
+ * Copyright (C) 2017 - 2024 European Commission | eDelivery | DomiSMP
* %%
* Licensed under the EUPL, Version 1.2 or – as soon they will be approved by the European Commission - subsequent
* versions of the EUPL (the "Licence");
diff --git a/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/data/ui/databind/SMPAuthorityDeserializer.java b/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/data/ui/databind/SMPAuthorityDeserializer.java
index cec219430dc842bfd4df349c89e49e23f72f6029..83958f67b86e5c8d6174814137703350dcad23a4 100644
--- a/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/data/ui/databind/SMPAuthorityDeserializer.java
+++ b/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/data/ui/databind/SMPAuthorityDeserializer.java
@@ -2,7 +2,7 @@
* #START_LICENSE#
* smp-server-library
* %%
- * Copyright (C) 2017 - 2023 European Commission | eDelivery | DomiSMP
+ * Copyright (C) 2017 - 2024 European Commission | eDelivery | DomiSMP
* %%
* Licensed under the EUPL, Version 1.2 or – as soon they will be approved by the European Commission - subsequent
* versions of the EUPL (the "Licence");
diff --git a/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/data/ui/enums/AlertLevelEnum.java b/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/data/ui/enums/AlertLevelEnum.java
index d5278a80b39d234834f57b76610ba22f514345c9..049b5c6875ea88546c5c5b565371b065f9e8cbaf 100644
--- a/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/data/ui/enums/AlertLevelEnum.java
+++ b/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/data/ui/enums/AlertLevelEnum.java
@@ -2,7 +2,7 @@
* #START_LICENSE#
* smp-server-library
* %%
- * Copyright (C) 2017 - 2023 European Commission | eDelivery | DomiSMP
+ * Copyright (C) 2017 - 2024 European Commission | eDelivery | DomiSMP
* %%
* Licensed under the EUPL, Version 1.2 or – as soon they will be approved by the European Commission - subsequent
* versions of the EUPL (the "Licence");
diff --git a/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/data/ui/enums/AlertStatusEnum.java b/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/data/ui/enums/AlertStatusEnum.java
index b6410ab48af5590f57f62e237f1639ab243fc250..2ef829ae55a8b6625bf375d88546f171b000184f 100644
--- a/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/data/ui/enums/AlertStatusEnum.java
+++ b/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/data/ui/enums/AlertStatusEnum.java
@@ -2,7 +2,7 @@
* #START_LICENSE#
* smp-server-library
* %%
- * Copyright (C) 2017 - 2023 European Commission | eDelivery | DomiSMP
+ * Copyright (C) 2017 - 2024 European Commission | eDelivery | DomiSMP
* %%
* Licensed under the EUPL, Version 1.2 or – as soon they will be approved by the European Commission - subsequent
* versions of the EUPL (the "Licence");
diff --git a/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/data/ui/enums/AlertSuspensionMomentEnum.java b/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/data/ui/enums/AlertSuspensionMomentEnum.java
index 73887363277e53047444dc5d1877095b40b8faf4..fa9db56dc2308f5dad4cc386781b705168058d83 100644
--- a/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/data/ui/enums/AlertSuspensionMomentEnum.java
+++ b/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/data/ui/enums/AlertSuspensionMomentEnum.java
@@ -2,7 +2,7 @@
* #START_LICENSE#
* smp-server-library
* %%
- * Copyright (C) 2017 - 2023 European Commission | eDelivery | DomiSMP
+ * Copyright (C) 2017 - 2024 European Commission | eDelivery | DomiSMP
* %%
* Licensed under the EUPL, Version 1.2 or – as soon they will be approved by the European Commission - subsequent
* versions of the EUPL (the "Licence");
diff --git a/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/data/ui/enums/AlertTypeEnum.java b/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/data/ui/enums/AlertTypeEnum.java
index 46bc27c73c28a0efa9346de9662107adeb8a9208..fb4d67f1213fc488551e6c16bd09542ad231c8e4 100644
--- a/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/data/ui/enums/AlertTypeEnum.java
+++ b/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/data/ui/enums/AlertTypeEnum.java
@@ -2,7 +2,7 @@
* #START_LICENSE#
* smp-server-library
* %%
- * Copyright (C) 2017 - 2023 European Commission | eDelivery | DomiSMP
+ * Copyright (C) 2017 - 2024 European Commission | eDelivery | DomiSMP
* %%
* Licensed under the EUPL, Version 1.2 or – as soon they will be approved by the European Commission - subsequent
* versions of the EUPL (the "Licence");
diff --git a/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/data/ui/enums/EntityROStatus.java b/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/data/ui/enums/EntityROStatus.java
index 3a5347c6807c5268b2c8aa2f397024808b2fb8c3..b8847430399cc14d59e89a4ddd3727b593276f82 100644
--- a/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/data/ui/enums/EntityROStatus.java
+++ b/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/data/ui/enums/EntityROStatus.java
@@ -2,7 +2,7 @@
* #START_LICENSE#
* smp-server-library
* %%
- * Copyright (C) 2017 - 2023 European Commission | eDelivery | DomiSMP
+ * Copyright (C) 2017 - 2024 European Commission | eDelivery | DomiSMP
* %%
* Licensed under the EUPL, Version 1.2 or – as soon they will be approved by the European Commission - subsequent
* versions of the EUPL (the "Licence");
diff --git a/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/data/ui/enums/SMLStatusEnum.java b/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/data/ui/enums/SMLStatusEnum.java
index c0d714e35bf9fd669561c1aa1b708266d0437bac..9dc1fa834185b739824b6ea6d0a6d612bd7f786b 100644
--- a/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/data/ui/enums/SMLStatusEnum.java
+++ b/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/data/ui/enums/SMLStatusEnum.java
@@ -2,7 +2,7 @@
* #START_LICENSE#
* smp-server-library
* %%
- * Copyright (C) 2017 - 2023 European Commission | eDelivery | DomiSMP
+ * Copyright (C) 2017 - 2024 European Commission | eDelivery | DomiSMP
* %%
* Licensed under the EUPL, Version 1.2 or – as soon they will be approved by the European Commission - subsequent
* versions of the EUPL (the "Licence");
diff --git a/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/data/ui/exceptions/ErrorResponseRO.java b/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/data/ui/exceptions/ErrorResponseRO.java
index fd45bba8b1751a34d8e31019f5fdaabdc32e26be..3ba836cfc21c9f1e0409ca95b208010c152d56cd 100644
--- a/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/data/ui/exceptions/ErrorResponseRO.java
+++ b/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/data/ui/exceptions/ErrorResponseRO.java
@@ -2,7 +2,7 @@
* #START_LICENSE#
* smp-server-library
* %%
- * Copyright (C) 2017 - 2023 European Commission | eDelivery | DomiSMP
+ * Copyright (C) 2017 - 2024 European Commission | eDelivery | DomiSMP
* %%
* Licensed under the EUPL, Version 1.2 or – as soon they will be approved by the European Commission - subsequent
* versions of the EUPL (the "Licence");
diff --git a/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/exceptions/BadRequestException.java b/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/exceptions/BadRequestException.java
index 6c1a2f58a1d0ee988a19e5ab830d6cafa5fd1816..13076cba0740e6c4bfc41b0bd7141d2758eac948 100644
--- a/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/exceptions/BadRequestException.java
+++ b/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/exceptions/BadRequestException.java
@@ -2,7 +2,7 @@
* #START_LICENSE#
* smp-webapp
* %%
- * Copyright (C) 2017 - 2023 European Commission | eDelivery | DomiSMP
+ * Copyright (C) 2017 - 2024 European Commission | eDelivery | DomiSMP
* %%
* Licensed under the EUPL, Version 1.2 or – as soon they will be approved by the European Commission - subsequent
* versions of the EUPL (the "Licence");
diff --git a/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/exceptions/CertificateAlreadyRegisteredException.java b/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/exceptions/CertificateAlreadyRegisteredException.java
index d8ebb78e3149577e7b2e825a04dde08085e23c61..854df699c3c0f41413c90d3e000a0cb3e2c39f94 100644
--- a/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/exceptions/CertificateAlreadyRegisteredException.java
+++ b/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/exceptions/CertificateAlreadyRegisteredException.java
@@ -2,7 +2,7 @@
* #START_LICENSE#
* smp-server-library
* %%
- * Copyright (C) 2017 - 2023 European Commission | eDelivery | DomiSMP
+ * Copyright (C) 2017 - 2024 European Commission | eDelivery | DomiSMP
* %%
* Licensed under the EUPL, Version 1.2 or – as soon they will be approved by the European Commission - subsequent
* versions of the EUPL (the "Licence");
diff --git a/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/exceptions/CertificateNotTrustedException.java b/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/exceptions/CertificateNotTrustedException.java
index ecfa997a13421e373052750d3db6c8c4fa12c102..3662a6590fe80021c6098a68a85c56509711d2dc 100644
--- a/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/exceptions/CertificateNotTrustedException.java
+++ b/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/exceptions/CertificateNotTrustedException.java
@@ -2,7 +2,7 @@
* #START_LICENSE#
* smp-server-library
* %%
- * Copyright (C) 2017 - 2023 European Commission | eDelivery | DomiSMP
+ * Copyright (C) 2017 - 2024 European Commission | eDelivery | DomiSMP
* %%
* Licensed under the EUPL, Version 1.2 or – as soon they will be approved by the European Commission - subsequent
* versions of the EUPL (the "Licence");
diff --git a/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/exceptions/ErrorBusinessCode.java b/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/exceptions/ErrorBusinessCode.java
index 8e437f8d7da036560f57ff1edcdac5c3259120d0..741ac60887adc12eda7d74709b75fba6ce3951f3 100644
--- a/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/exceptions/ErrorBusinessCode.java
+++ b/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/exceptions/ErrorBusinessCode.java
@@ -2,7 +2,7 @@
* #START_LICENSE#
* smp-webapp
* %%
- * Copyright (C) 2017 - 2023 European Commission | eDelivery | DomiSMP
+ * Copyright (C) 2017 - 2024 European Commission | eDelivery | DomiSMP
* %%
* Licensed under the EUPL, Version 1.2 or – as soon they will be approved by the European Commission - subsequent
* versions of the EUPL (the "Licence");
diff --git a/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/exceptions/ErrorCode.java b/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/exceptions/ErrorCode.java
index 6efe2bb616bb7ce01f185f0c67398ceb794f7fe5..4ef9ee1f522b3d1020f629404faff1d212a17b8f 100644
--- a/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/exceptions/ErrorCode.java
+++ b/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/exceptions/ErrorCode.java
@@ -2,7 +2,7 @@
* #START_LICENSE#
* smp-server-library
* %%
- * Copyright (C) 2017 - 2023 European Commission | eDelivery | DomiSMP
+ * Copyright (C) 2017 - 2024 European Commission | eDelivery | DomiSMP
* %%
* Licensed under the EUPL, Version 1.2 or – as soon they will be approved by the European Commission - subsequent
* versions of the EUPL (the "Licence");
diff --git a/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/exceptions/SMLErrorMessages.java b/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/exceptions/SMLErrorMessages.java
index 389c47e0754eaa3b79e210c5338bd20bd5a7d63e..2d1565bb5c06da00a78c17657cf34ece16212672 100644
--- a/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/exceptions/SMLErrorMessages.java
+++ b/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/exceptions/SMLErrorMessages.java
@@ -2,7 +2,7 @@
* #START_LICENSE#
* smp-server-library
* %%
- * Copyright (C) 2017 - 2023 European Commission | eDelivery | DomiSMP
+ * Copyright (C) 2017 - 2024 European Commission | eDelivery | DomiSMP
* %%
* Licensed under the EUPL, Version 1.2 or – as soon they will be approved by the European Commission - subsequent
* versions of the EUPL (the "Licence");
diff --git a/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/exceptions/SMPRuntimeException.java b/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/exceptions/SMPRuntimeException.java
index e9e402bf5a8dcb313e7709ebb5b9be38fdb785e5..f9fb3db5b0da9f9abc242e9bc0b52b65d46438fb 100644
--- a/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/exceptions/SMPRuntimeException.java
+++ b/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/exceptions/SMPRuntimeException.java
@@ -2,7 +2,7 @@
* #START_LICENSE#
* smp-server-library
* %%
- * Copyright (C) 2017 - 2023 European Commission | eDelivery | DomiSMP
+ * Copyright (C) 2017 - 2024 European Commission | eDelivery | DomiSMP
* %%
* Licensed under the EUPL, Version 1.2 or – as soon they will be approved by the European Commission - subsequent
* versions of the EUPL (the "Licence");
diff --git a/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/exceptions/SMPTestIsALiveException.java b/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/exceptions/SMPTestIsALiveException.java
index 0f5ad43d16850260f81c8849127f234e9eb372f6..284f18681218a2d70c69955a307be6377be80a1f 100644
--- a/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/exceptions/SMPTestIsALiveException.java
+++ b/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/exceptions/SMPTestIsALiveException.java
@@ -2,7 +2,7 @@
* #START_LICENSE#
* smp-server-library
* %%
- * Copyright (C) 2017 - 2023 European Commission | eDelivery | DomiSMP
+ * Copyright (C) 2017 - 2024 European Commission | eDelivery | DomiSMP
* %%
* Licensed under the EUPL, Version 1.2 or – as soon they will be approved by the European Commission - subsequent
* versions of the EUPL (the "Licence");
diff --git a/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/identifiers/Identifier.java b/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/identifiers/Identifier.java
index a4383fa4b19bffc69eb65b4267ef7e4237a2c583..0991e1c5e22ee14494487324a56a45aafeceec8b 100644
--- a/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/identifiers/Identifier.java
+++ b/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/identifiers/Identifier.java
@@ -2,7 +2,7 @@
* #START_LICENSE#
* smp-server-library
* %%
- * Copyright (C) 2017 - 2023 European Commission | eDelivery | DomiSMP
+ * Copyright (C) 2017 - 2024 European Commission | eDelivery | DomiSMP
* %%
* Licensed under the EUPL, Version 1.2 or – as soon they will be approved by the European Commission - subsequent
* versions of the EUPL (the "Licence");
diff --git a/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/identifiers/IdentifierFormatter.java b/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/identifiers/IdentifierFormatter.java
index 54c9709d63dab3a5a8dffd03552a70e5e0671944..5fd49af059a719dbc47de7585a990518062f8b00 100644
--- a/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/identifiers/IdentifierFormatter.java
+++ b/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/identifiers/IdentifierFormatter.java
@@ -2,7 +2,7 @@
* #START_LICENSE#
* smp-server-library
* %%
- * Copyright (C) 2017 - 2023 European Commission | eDelivery | DomiSMP
+ * Copyright (C) 2017 - 2024 European Commission | eDelivery | DomiSMP
* %%
* Licensed under the EUPL, Version 1.2 or – as soon they will be approved by the European Commission - subsequent
* versions of the EUPL (the "Licence");
diff --git a/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/logging/DefaultMessageConverter.java b/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/logging/DefaultMessageConverter.java
index 34255713fcc4968acb07668f51aa2f8bd96b82b6..5fd1f3cdd02554a39d2ab3f54d12bfd4dcaa498c 100644
--- a/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/logging/DefaultMessageConverter.java
+++ b/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/logging/DefaultMessageConverter.java
@@ -2,7 +2,7 @@
* #START_LICENSE#
* smp-server-library
* %%
- * Copyright (C) 2017 - 2023 European Commission | eDelivery | DomiSMP
+ * Copyright (C) 2017 - 2024 European Commission | eDelivery | DomiSMP
* %%
* Licensed under the EUPL, Version 1.2 or – as soon they will be approved by the European Commission - subsequent
* versions of the EUPL (the "Licence");
diff --git a/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/logging/SMPLogger.java b/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/logging/SMPLogger.java
index 5dfe21b008f4bdd837dd4613c8b01bcdd6357f26..6ad98296eadb29c237aba3d088288e3e8a350261 100644
--- a/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/logging/SMPLogger.java
+++ b/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/logging/SMPLogger.java
@@ -2,7 +2,7 @@
* #START_LICENSE#
* smp-server-library
* %%
- * Copyright (C) 2017 - 2023 European Commission | eDelivery | DomiSMP
+ * Copyright (C) 2017 - 2024 European Commission | eDelivery | DomiSMP
* %%
* Licensed under the EUPL, Version 1.2 or – as soon they will be approved by the European Commission - subsequent
* versions of the EUPL (the "Licence");
diff --git a/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/logging/SMPLoggerFactory.java b/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/logging/SMPLoggerFactory.java
index 59082cd3aa32290fdb4d4629a32985e8903966c6..69ad3d2ae9d3db253de39cdcf2ba7b5ff2822249 100644
--- a/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/logging/SMPLoggerFactory.java
+++ b/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/logging/SMPLoggerFactory.java
@@ -2,7 +2,7 @@
* #START_LICENSE#
* smp-server-library
* %%
- * Copyright (C) 2017 - 2023 European Commission | eDelivery | DomiSMP
+ * Copyright (C) 2017 - 2024 European Commission | eDelivery | DomiSMP
* %%
* Licensed under the EUPL, Version 1.2 or – as soon they will be approved by the European Commission - subsequent
* versions of the EUPL (the "Licence");
diff --git a/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/logging/SMPMessageCode.java b/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/logging/SMPMessageCode.java
index 7a95a1708b391f9abafd2b314e6ffb1583d37de2..533ab1b82e1ec0818758e116cd01c2875d87a9fe 100644
--- a/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/logging/SMPMessageCode.java
+++ b/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/logging/SMPMessageCode.java
@@ -2,7 +2,7 @@
* #START_LICENSE#
* smp-server-library
* %%
- * Copyright (C) 2017 - 2023 European Commission | eDelivery | DomiSMP
+ * Copyright (C) 2017 - 2024 European Commission | eDelivery | DomiSMP
* %%
* Licensed under the EUPL, Version 1.2 or – as soon they will be approved by the European Commission - subsequent
* versions of the EUPL (the "Licence");
diff --git a/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/logging/api/CategoryLogger.java b/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/logging/api/CategoryLogger.java
index 7f8d466cb96da208dd5e89369e5de0021ddb9539..8b47cf5f17dcc8789206615b6d8a0a037765f627 100644
--- a/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/logging/api/CategoryLogger.java
+++ b/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/logging/api/CategoryLogger.java
@@ -2,7 +2,7 @@
* #START_LICENSE#
* smp-server-library
* %%
- * Copyright (C) 2017 - 2023 European Commission | eDelivery | DomiSMP
+ * Copyright (C) 2017 - 2024 European Commission | eDelivery | DomiSMP
* %%
* Licensed under the EUPL, Version 1.2 or – as soon they will be approved by the European Commission - subsequent
* versions of the EUPL (the "Licence");
diff --git a/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/logging/api/MessageCode.java b/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/logging/api/MessageCode.java
index 0a1943a009d16849f87769a9a3f5d287cf3d79c0..b793b900941c1fd46614ad4e7e5e6ace49f34f22 100644
--- a/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/logging/api/MessageCode.java
+++ b/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/logging/api/MessageCode.java
@@ -2,7 +2,7 @@
* #START_LICENSE#
* smp-server-library
* %%
- * Copyright (C) 2017 - 2023 European Commission | eDelivery | DomiSMP
+ * Copyright (C) 2017 - 2024 European Commission | eDelivery | DomiSMP
* %%
* Licensed under the EUPL, Version 1.2 or – as soon they will be approved by the European Commission - subsequent
* versions of the EUPL (the "Licence");
diff --git a/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/logging/api/MessageConverter.java b/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/logging/api/MessageConverter.java
index 0d2aadc66e5cf25b94c152da9916eb151364d8c9..ffe13bc438a303b9bd2d9d0119a9bc48acfa5038 100644
--- a/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/logging/api/MessageConverter.java
+++ b/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/logging/api/MessageConverter.java
@@ -2,7 +2,7 @@
* #START_LICENSE#
* smp-server-library
* %%
- * Copyright (C) 2017 - 2023 European Commission | eDelivery | DomiSMP
+ * Copyright (C) 2017 - 2024 European Commission | eDelivery | DomiSMP
* %%
* Licensed under the EUPL, Version 1.2 or – as soon they will be approved by the European Commission - subsequent
* versions of the EUPL (the "Licence");
diff --git a/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/security/DomainGuard.java b/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/security/DomainGuard.java
index 09bab0c5db894c4ae2fe941494b3b32860cfa4b3..35e9c89c23b1d2ecf6da09775dfc86a5c9be6127 100644
--- a/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/security/DomainGuard.java
+++ b/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/security/DomainGuard.java
@@ -2,7 +2,7 @@
* #START_LICENSE#
* smp-server-library
* %%
- * Copyright (C) 2017 - 2023 European Commission | eDelivery | DomiSMP
+ * Copyright (C) 2017 - 2024 European Commission | eDelivery | DomiSMP
* %%
* Licensed under the EUPL, Version 1.2 or – as soon they will be approved by the European Commission - subsequent
* versions of the EUPL (the "Licence");
diff --git a/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/security/ResourceGuard.java b/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/security/ResourceGuard.java
index ee917e48689e7a9e6e0ebfd33c75634187ca13ff..ddb816aec16a52e9b42637e753f4abec12312ad0 100644
--- a/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/security/ResourceGuard.java
+++ b/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/security/ResourceGuard.java
@@ -2,7 +2,7 @@
* #START_LICENSE#
* smp-server-library
* %%
- * Copyright (C) 2017 - 2023 European Commission | eDelivery | DomiSMP
+ * Copyright (C) 2017 - 2024 European Commission | eDelivery | DomiSMP
* %%
* Licensed under the EUPL, Version 1.2 or – as soon they will be approved by the European Commission - subsequent
* versions of the EUPL (the "Licence");
@@ -19,7 +19,6 @@
package eu.europa.ec.edelivery.smp.security;
import eu.europa.ec.edelivery.smp.auth.SMPUserDetails;
-import eu.europa.ec.edelivery.smp.conversion.IdentifierService;
import eu.europa.ec.edelivery.smp.data.dao.DomainMemberDao;
import eu.europa.ec.edelivery.smp.data.dao.GroupMemberDao;
import eu.europa.ec.edelivery.smp.data.dao.ResourceMemberDao;
@@ -47,13 +46,11 @@ public class ResourceGuard {
DomainMemberDao domainMemberDao;
GroupMemberDao groupMemberDao;
ResourceMemberDao resourceMemberDao;
- IdentifierService identifierService;
- public ResourceGuard(DomainMemberDao domainMemberDao, GroupMemberDao groupMemberDao, ResourceMemberDao resourceMemberDao, IdentifierService identifierService) {
+ public ResourceGuard(DomainMemberDao domainMemberDao, GroupMemberDao groupMemberDao, ResourceMemberDao resourceMemberDao) {
this.domainMemberDao = domainMemberDao;
this.groupMemberDao = groupMemberDao;
this.resourceMemberDao = resourceMemberDao;
- this.identifierService = identifierService;
}
/**
diff --git a/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/services/CRLVerifierService.java b/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/services/CRLVerifierService.java
index dc7517513113107ea75408d95c98d4db721784e9..730c42846118a65b69a6935fbab197f47368ea69 100644
--- a/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/services/CRLVerifierService.java
+++ b/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/services/CRLVerifierService.java
@@ -2,7 +2,7 @@
* #START_LICENSE#
* smp-server-library
* %%
- * Copyright (C) 2017 - 2023 European Commission | eDelivery | DomiSMP
+ * Copyright (C) 2017 - 2024 European Commission | eDelivery | DomiSMP
* %%
* Licensed under the EUPL, Version 1.2 or – as soon they will be approved by the European Commission - subsequent
* versions of the EUPL (the "Licence");
@@ -18,25 +18,6 @@
*/
package eu.europa.ec.edelivery.smp.services;
-/**
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- * <p/>
- * http://www.apache.org/licenses/LICENSE-2.0
- * <p/>
- * 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.
- */
-
import eu.europa.ec.edelivery.security.utils.X509CertificateUtils;
import eu.europa.ec.edelivery.smp.exceptions.ErrorCode;
diff --git a/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/services/ConfigurationService.java b/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/services/ConfigurationService.java
index 3384a6476029e50fba90971650d9d9e2c343b423..b6439bc9ccbfba6d6008438e2cd98a2662d35f2e 100644
--- a/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/services/ConfigurationService.java
+++ b/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/services/ConfigurationService.java
@@ -2,7 +2,7 @@
* #START_LICENSE#
* smp-server-library
* %%
- * Copyright (C) 2017 - 2023 European Commission | eDelivery | DomiSMP
+ * Copyright (C) 2017 - 2024 European Commission | eDelivery | DomiSMP
* %%
* Licensed under the EUPL, Version 1.2 or – as soon they will be approved by the European Commission - subsequent
* versions of the EUPL (the "Licence");
diff --git a/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/services/CredentialService.java b/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/services/CredentialService.java
index f789b670cfb7570a08876a96d2f3e256ccaf76b2..bc7908249d738e707a7dcb18a20aa8e49ec280ec 100644
--- a/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/services/CredentialService.java
+++ b/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/services/CredentialService.java
@@ -2,7 +2,7 @@
* #START_LICENSE#
* smp-server-library
* %%
- * Copyright (C) 2017 - 2023 European Commission | eDelivery | DomiSMP
+ * Copyright (C) 2017 - 2024 European Commission | eDelivery | DomiSMP
* %%
* Licensed under the EUPL, Version 1.2 or – as soon they will be approved by the European Commission - subsequent
* versions of the EUPL (the "Licence");
diff --git a/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/services/CredentialValidatorService.java b/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/services/CredentialValidatorService.java
index 3d960cb1025d84add4948f4dfc0cf42ddb55532f..8e9a6009a6bbd0927cb4383b81e2cecb1707a936 100644
--- a/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/services/CredentialValidatorService.java
+++ b/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/services/CredentialValidatorService.java
@@ -2,7 +2,7 @@
* #START_LICENSE#
* smp-server-library
* %%
- * Copyright (C) 2017 - 2023 European Commission | eDelivery | DomiSMP
+ * Copyright (C) 2017 - 2024 European Commission | eDelivery | DomiSMP
* %%
* Licensed under the EUPL, Version 1.2 or – as soon they will be approved by the European Commission - subsequent
* versions of the EUPL (the "Licence");
diff --git a/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/services/CredentialsAlertService.java b/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/services/CredentialsAlertService.java
index ebbd661147c9cccc9946d796ae054aa428d359d0..03d68b4b55fc09787295e065fb2e5e365afe90b6 100644
--- a/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/services/CredentialsAlertService.java
+++ b/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/services/CredentialsAlertService.java
@@ -2,7 +2,7 @@
* #START_LICENSE#
* smp-server-library
* %%
- * Copyright (C) 2017 - 2023 European Commission | eDelivery | DomiSMP
+ * Copyright (C) 2017 - 2024 European Commission | eDelivery | DomiSMP
* %%
* Licensed under the EUPL, Version 1.2 or – as soon they will be approved by the European Commission - subsequent
* versions of the EUPL (the "Licence");
diff --git a/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/services/DomainService.java b/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/services/DomainService.java
index 19d2900c97232ccacfd59aa6587b5a54e4483b87..39b0272750660cccd8b5d9158c18df817cf152eb 100644
--- a/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/services/DomainService.java
+++ b/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/services/DomainService.java
@@ -2,7 +2,7 @@
* #START_LICENSE#
* smp-server-library
* %%
- * Copyright (C) 2017 - 2023 European Commission | eDelivery | DomiSMP
+ * Copyright (C) 2017 - 2024 European Commission | eDelivery | DomiSMP
* %%
* Licensed under the EUPL, Version 1.2 or – as soon they will be approved by the European Commission - subsequent
* versions of the EUPL (the "Licence");
diff --git a/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/services/ICRLVerifierService.java b/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/services/ICRLVerifierService.java
index 8edfa605feb4e5b8c7969f4cbc759d6025be6574..f14f958442c3409934340af526ebdf52d006d73c 100644
--- a/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/services/ICRLVerifierService.java
+++ b/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/services/ICRLVerifierService.java
@@ -2,7 +2,7 @@
* #START_LICENSE#
* smp-server-library
* %%
- * Copyright (C) 2017 - 2023 European Commission | eDelivery | DomiSMP
+ * Copyright (C) 2017 - 2024 European Commission | eDelivery | DomiSMP
* %%
* Licensed under the EUPL, Version 1.2 or – as soon they will be approved by the European Commission - subsequent
* versions of the EUPL (the "Licence");
diff --git a/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/services/PayloadValidatorService.java b/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/services/PayloadValidatorService.java
index d1bda37dce144ef476970cf380e3c8e3c6a65712..d04b3f3a8bcc22b3a65153788b15c715f4b3ee13 100644
--- a/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/services/PayloadValidatorService.java
+++ b/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/services/PayloadValidatorService.java
@@ -2,7 +2,7 @@
* #START_LICENSE#
* smp-server-library
* %%
- * Copyright (C) 2017 - 2023 European Commission | eDelivery | DomiSMP
+ * Copyright (C) 2017 - 2024 European Commission | eDelivery | DomiSMP
* %%
* Licensed under the EUPL, Version 1.2 or – as soon they will be approved by the European Commission - subsequent
* versions of the EUPL (the "Licence");
diff --git a/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/services/SMLIntegrationService.java b/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/services/SMLIntegrationService.java
index a3bf40b54c157e124fd353efc99d936056872434..629c69d29f0f456e9a281904af177e45dc4a02f4 100644
--- a/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/services/SMLIntegrationService.java
+++ b/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/services/SMLIntegrationService.java
@@ -2,7 +2,7 @@
* #START_LICENSE#
* smp-server-library
* %%
- * Copyright (C) 2017 - 2023 European Commission | eDelivery | DomiSMP
+ * Copyright (C) 2017 - 2024 European Commission | eDelivery | DomiSMP
* %%
* Licensed under the EUPL, Version 1.2 or – as soon they will be approved by the European Commission - subsequent
* versions of the EUPL (the "Licence");
@@ -29,7 +29,6 @@ import eu.europa.ec.edelivery.smp.logging.SMPLogger;
import eu.europa.ec.edelivery.smp.logging.SMPLoggerFactory;
import eu.europa.ec.edelivery.smp.sml.SmlConnector;
import org.apache.commons.lang3.StringUtils;
-import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Propagation;
import org.springframework.transaction.annotation.Transactional;
@@ -53,17 +52,17 @@ public class SMLIntegrationService {
private static final SMPLogger LOG = SMPLoggerFactory.getLogger(SMLIntegrationService.class);
private static final String ERROR_MESSAGE_DNS_NOT_ENABLED = "SML integration is not enabled!";
- @Autowired
- private ConfigurationService configurationService;
+ private final ConfigurationService configurationService;
+ private final SmlConnector smlConnector;
+ private final DomainDao domainDao;
+ private final IdentifierService identifierService;
- @Autowired
- private SmlConnector smlConnector;
-
- @Autowired
- private DomainDao domainDao;
-
- @Autowired
- private IdentifierService identifierService;
+ public SMLIntegrationService(ConfigurationService configurationService, SmlConnector smlConnector, DomainDao domainDao, IdentifierService identifierService) {
+ this.configurationService = configurationService;
+ this.smlConnector = smlConnector;
+ this.domainDao = domainDao;
+ this.identifierService = identifierService;
+ }
/**
* Checks whether the participant exists in SML or not.
@@ -86,7 +85,7 @@ public class SMLIntegrationService {
* Method in transaction update domain status and registers domain to SML.
* If registration fails - transaction is rolled back
*
- * @param domain
+ * @param domain the domain entity to register
*/
@Transactional
public void registerDomain(DBDomain domain) {
@@ -113,10 +112,10 @@ public class SMLIntegrationService {
}
/**
- * Method in transaction update domain status and registers domain to SML.
- * If registration fails - transaction is rolled back
+ * Method un-registers domain from SML and updates status in database.
+ * If un-registration fails - transaction is rolled back.
*
- * @param domain
+ * @param domain the domain entity to un register from SML
*/
@Transactional
public void unRegisterDomain(DBDomain domain) {
@@ -134,8 +133,8 @@ public class SMLIntegrationService {
* Method in transaction update resource status and registers it to SML.
* If registration fails - transaction is rolled back
*
- * @param resource
- * @param domain
+ * @param resource the resource entity to register
+ * @param domain the domain entity to for the resource
*/
@Transactional(propagation = Propagation.REQUIRES_NEW)
@@ -143,8 +142,8 @@ public class SMLIntegrationService {
LOG.businessDebug(BUS_SML_REGISTER_SERVICE_GROUP, resource.getIdentifierValue(), resource.getIdentifierScheme(), domain.getDomainCode());
if (!isSMLIntegrationEnabled()) {
- String msg = "SML integration is not enabled!";
- LOG.businessWarn(BUS_SML_REGISTER_SERVICE_GROUP_FAILED, resource.getIdentifierValue(), resource.getIdentifierScheme(), domain.getDomainCode(), msg);
+ LOG.businessWarn(BUS_SML_REGISTER_SERVICE_GROUP_FAILED, resource.getIdentifierValue(),
+ resource.getIdentifierScheme(), domain.getDomainCode(), ERROR_MESSAGE_DNS_NOT_ENABLED);
return;
}
Identifier normalizedParticipantId = identifierService
@@ -177,7 +176,7 @@ public class SMLIntegrationService {
if (map != null && map.containsKey(resDefIdentifier)) {
return map.get(resDefIdentifier);
}
- LOG.info("return null because configuration does not have document type and document type [{}]", resource, resDefIdentifier);
+ LOG.info("return null because configuration does not have document type and document type [{}]", resDefIdentifier);
return null;
}
@@ -187,16 +186,17 @@ public class SMLIntegrationService {
* <p>
* If registration fails - transaction is rolled back
*
- * @param resource
- * @param domain
+ * @param resource resourceIdentifier to unregister from SML
+ * @param domain for which resource belongs to
*/
@Transactional(propagation = Propagation.REQUIRES_NEW)
public void unregisterParticipant(DBResource resource, DBDomain domain) {
LOG.businessDebug(BUS_SML_UNREGISTER_SERVICE_GROUP, resource.getIdentifierValue(), resource.getIdentifierScheme(), domain.getDomainCode());
if (!isSMLIntegrationEnabled()) {
- String msg = "SML integration is not enabled!";
- LOG.businessWarn(BUS_SML_UNREGISTER_SERVICE_GROUP_FAILED, resource.getIdentifierValue(), resource.getIdentifierScheme(), domain.getDomainCode(), msg);
+
+ LOG.businessWarn(BUS_SML_UNREGISTER_SERVICE_GROUP_FAILED, resource.getIdentifierValue(), resource.getIdentifierScheme(),
+ domain.getDomainCode(), ERROR_MESSAGE_DNS_NOT_ENABLED);
return;
}
diff --git a/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/services/mail/MailDataModel.java b/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/services/mail/MailDataModel.java
index e36930b280b770454176b426943872d333acd742..1d0bf7b550e1d20a4a98143f658413d84aa7bf80 100644
--- a/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/services/mail/MailDataModel.java
+++ b/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/services/mail/MailDataModel.java
@@ -2,7 +2,7 @@
* #START_LICENSE#
* smp-server-library
* %%
- * Copyright (C) 2017 - 2023 European Commission | eDelivery | DomiSMP
+ * Copyright (C) 2017 - 2024 European Commission | eDelivery | DomiSMP
* %%
* Licensed under the EUPL, Version 1.2 or – as soon they will be approved by the European Commission - subsequent
* versions of the EUPL (the "Licence");
diff --git a/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/services/mail/MailService.java b/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/services/mail/MailService.java
index 3200c82de8579d57314a3492eebd89d488cadeeb..d31bd45f4fbe825bf0055102ea26a0549a431722 100644
--- a/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/services/mail/MailService.java
+++ b/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/services/mail/MailService.java
@@ -2,7 +2,7 @@
* #START_LICENSE#
* smp-server-library
* %%
- * Copyright (C) 2017 - 2023 European Commission | eDelivery | DomiSMP
+ * Copyright (C) 2017 - 2024 European Commission | eDelivery | DomiSMP
* %%
* Licensed under the EUPL, Version 1.2 or – as soon they will be approved by the European Commission - subsequent
* versions of the EUPL (the "Licence");
diff --git a/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/services/mail/MailTemplateService.java b/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/services/mail/MailTemplateService.java
index 475af35c33786627e3fed8471635bfdc82e5007a..91ddd8d9116ed016a91646941c0542cf1691d9ad 100644
--- a/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/services/mail/MailTemplateService.java
+++ b/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/services/mail/MailTemplateService.java
@@ -2,7 +2,7 @@
* #START_LICENSE#
* smp-server-library
* %%
- * Copyright (C) 2017 - 2023 European Commission | eDelivery | DomiSMP
+ * Copyright (C) 2017 - 2024 European Commission | eDelivery | DomiSMP
* %%
* Licensed under the EUPL, Version 1.2 or – as soon they will be approved by the European Commission - subsequent
* versions of the EUPL (the "Licence");
@@ -18,8 +18,11 @@
*/
package eu.europa.ec.edelivery.smp.services.mail;
+import eu.europa.ec.edelivery.smp.exceptions.ErrorCode;
+import eu.europa.ec.edelivery.smp.exceptions.SMPRuntimeException;
import eu.europa.ec.edelivery.smp.utils.StringNamedSubstitutor;
import org.apache.commons.lang3.StringUtils;
+import org.apache.commons.lang3.exception.ExceptionUtils;
import org.springframework.cache.annotation.Cacheable;
import org.springframework.stereotype.Component;
@@ -57,9 +60,8 @@ public class MailTemplateService {
modelData.put(MAIL_CONTENT, getMailBody(model));
return StringNamedSubstitutor.resolve(templateIS, modelData);
} catch (IOException e) {
- e.printStackTrace();
+ throw new SMPRuntimeException(ErrorCode.INTERNAL_ERROR, "Error reading mail template", ExceptionUtils.getRootCauseMessage(e));
}
- return null;
}
public String getMailHeader(MailDataModel model) {
@@ -78,12 +80,15 @@ public class MailTemplateService {
return getMailData(model, "mail." + model.getMailType().getTemplate() + ".content");
}
+
public String getMailData(MailDataModel model, String key) {
Properties translations = getMessageTranslations(model.getLanguage());
String dataTemplate = translations.getProperty(key);
return StringUtils.isBlank(dataTemplate) ? dataTemplate : StringNamedSubstitutor.resolve(dataTemplate, model.getModel());
}
+
+ @Cacheable("mail-templates-translations")
public Properties getMessageTranslations(String language) {
Properties translations = loadTranslations(language);
@@ -93,8 +98,7 @@ public class MailTemplateService {
return loadTranslations(DEFAULT_LANGUAGE);
}
- @Cacheable("mail-templates-translations")
- public Properties loadTranslations(String language) {
+ protected Properties loadTranslations(String language) {
String langResource = "/mail-messages/mail-messages_" + language + ".properties";
InputStream isLanguage = MailTemplateService.class.getResourceAsStream(langResource);
if (isLanguage != null) {
@@ -103,9 +107,9 @@ public class MailTemplateService {
translations.load(isLanguage);
return translations;
} catch (IOException e) {
- throw new RuntimeException(e);
+ throw new SMPRuntimeException(ErrorCode.INTERNAL_ERROR, "Error reading mail template", ExceptionUtils.getRootCauseMessage(e));
}
}
- return null;
+ return new Properties();
}
}
diff --git a/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/services/mail/prop/CredentialSuspendedProperties.java b/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/services/mail/prop/CredentialSuspendedProperties.java
index dc5604fd907e1658d3a1b12900c458c97366ec2b..5494e62d21297b0ca78068553d88b539baec30c6 100644
--- a/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/services/mail/prop/CredentialSuspendedProperties.java
+++ b/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/services/mail/prop/CredentialSuspendedProperties.java
@@ -2,7 +2,7 @@
* #START_LICENSE#
* smp-server-library
* %%
- * Copyright (C) 2017 - 2023 European Commission | eDelivery | DomiSMP
+ * Copyright (C) 2017 - 2024 European Commission | eDelivery | DomiSMP
* %%
* Licensed under the EUPL, Version 1.2 or – as soon they will be approved by the European Commission - subsequent
* versions of the EUPL (the "Licence");
diff --git a/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/services/mail/prop/CredentialVerificationFailedProperties.java b/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/services/mail/prop/CredentialVerificationFailedProperties.java
index 3ba9a7ca3b8c215659692088673fd326a8da49a0..2f44da2aaa1c18be0fe01447634f18135ee3d0a6 100644
--- a/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/services/mail/prop/CredentialVerificationFailedProperties.java
+++ b/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/services/mail/prop/CredentialVerificationFailedProperties.java
@@ -2,7 +2,7 @@
* #START_LICENSE#
* smp-server-library
* %%
- * Copyright (C) 2017 - 2023 European Commission | eDelivery | DomiSMP
+ * Copyright (C) 2017 - 2024 European Commission | eDelivery | DomiSMP
* %%
* Licensed under the EUPL, Version 1.2 or – as soon they will be approved by the European Commission - subsequent
* versions of the EUPL (the "Licence");
diff --git a/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/services/mail/prop/CredentialsChangedProperties.java b/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/services/mail/prop/CredentialsChangedProperties.java
index 668205c9ed727bfa69c5a3423465aa600a3ba44e..1fa3f3aa42d4e918387c57c11b5dd5668d76e3ee 100644
--- a/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/services/mail/prop/CredentialsChangedProperties.java
+++ b/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/services/mail/prop/CredentialsChangedProperties.java
@@ -2,7 +2,7 @@
* #START_LICENSE#
* smp-server-library
* %%
- * Copyright (C) 2017 - 2023 European Commission | eDelivery | DomiSMP
+ * Copyright (C) 2017 - 2024 European Commission | eDelivery | DomiSMP
* %%
* Licensed under the EUPL, Version 1.2 or – as soon they will be approved by the European Commission - subsequent
* versions of the EUPL (the "Licence");
diff --git a/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/services/mail/prop/CredentialsExpirationProperties.java b/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/services/mail/prop/CredentialsExpirationProperties.java
index 9c992b5d86d93f46b8f08c1705cfedad84385968..411c5f69c779dc374ea9f174ffb18868e880e3ea 100644
--- a/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/services/mail/prop/CredentialsExpirationProperties.java
+++ b/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/services/mail/prop/CredentialsExpirationProperties.java
@@ -2,7 +2,7 @@
* #START_LICENSE#
* smp-server-library
* %%
- * Copyright (C) 2017 - 2023 European Commission | eDelivery | DomiSMP
+ * Copyright (C) 2017 - 2024 European Commission | eDelivery | DomiSMP
* %%
* Licensed under the EUPL, Version 1.2 or – as soon they will be approved by the European Commission - subsequent
* versions of the EUPL (the "Licence");
diff --git a/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/services/mail/prop/CredentialsResetRequestProperties.java b/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/services/mail/prop/CredentialsResetRequestProperties.java
index 1535e1982244ef2d2d4b6eb433053013e7ddce63..799ee18dc06e78552c720132e4541d705d94698e 100644
--- a/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/services/mail/prop/CredentialsResetRequestProperties.java
+++ b/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/services/mail/prop/CredentialsResetRequestProperties.java
@@ -2,7 +2,7 @@
* #START_LICENSE#
* smp-server-library
* %%
- * Copyright (C) 2017 - 2023 European Commission | eDelivery | DomiSMP
+ * Copyright (C) 2017 - 2024 European Commission | eDelivery | DomiSMP
* %%
* Licensed under the EUPL, Version 1.2 or – as soon they will be approved by the European Commission - subsequent
* versions of the EUPL (the "Licence");
diff --git a/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/services/mail/prop/TestMailProperties.java b/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/services/mail/prop/TestMailProperties.java
index 4c695aeb2cbb8d9d22a1aa5e86717be96f90fe4a..e8c1251835c45e5671841a30919536c9ec182ac6 100644
--- a/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/services/mail/prop/TestMailProperties.java
+++ b/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/services/mail/prop/TestMailProperties.java
@@ -2,7 +2,7 @@
* #START_LICENSE#
* smp-server-library
* %%
- * Copyright (C) 2017 - 2023 European Commission | eDelivery | DomiSMP
+ * Copyright (C) 2017 - 2024 European Commission | eDelivery | DomiSMP
* %%
* Licensed under the EUPL, Version 1.2 or – as soon they will be approved by the European Commission - subsequent
* versions of the EUPL (the "Licence");
diff --git a/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/services/mail/prop/UserCreatedProperties.java b/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/services/mail/prop/UserCreatedProperties.java
index 5ffa558a63140949a66f6ce45549fe098c36a1b1..0fe4c8ad73e5bf3f235aade236eac20020aad38f 100644
--- a/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/services/mail/prop/UserCreatedProperties.java
+++ b/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/services/mail/prop/UserCreatedProperties.java
@@ -2,7 +2,7 @@
* #START_LICENSE#
* smp-server-library
* %%
- * Copyright (C) 2017 - 2023 European Commission | eDelivery | DomiSMP
+ * Copyright (C) 2017 - 2024 European Commission | eDelivery | DomiSMP
* %%
* Licensed under the EUPL, Version 1.2 or – as soon they will be approved by the European Commission - subsequent
* versions of the EUPL (the "Licence");
diff --git a/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/services/mail/prop/UserUpdatedProperties.java b/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/services/mail/prop/UserUpdatedProperties.java
index 51a36c52eae08e4162fb79bfc746672564fc91be..0bcc10cc17e69a228b19a17cc913a32ae356d034 100644
--- a/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/services/mail/prop/UserUpdatedProperties.java
+++ b/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/services/mail/prop/UserUpdatedProperties.java
@@ -2,7 +2,7 @@
* #START_LICENSE#
* smp-server-library
* %%
- * Copyright (C) 2017 - 2023 European Commission | eDelivery | DomiSMP
+ * Copyright (C) 2017 - 2024 European Commission | eDelivery | DomiSMP
* %%
* Licensed under the EUPL, Version 1.2 or – as soon they will be approved by the European Commission - subsequent
* versions of the EUPL (the "Licence");
diff --git a/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/services/resource/AbstractResourceHandler.java b/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/services/resource/AbstractResourceHandler.java
index ed6ff19f88a42652bafa6768f1e80cdc4062085f..f30cd5dd7ac9e1ea015b79fff16b2433b97e2a71 100644
--- a/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/services/resource/AbstractResourceHandler.java
+++ b/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/services/resource/AbstractResourceHandler.java
@@ -2,7 +2,7 @@
* #START_LICENSE#
* smp-server-library
* %%
- * Copyright (C) 2017 - 2023 European Commission | eDelivery | DomiSMP
+ * Copyright (C) 2017 - 2024 European Commission | eDelivery | DomiSMP
* %%
* Licensed under the EUPL, Version 1.2 or – as soon they will be approved by the European Commission - subsequent
* versions of the EUPL (the "Licence");
diff --git a/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/services/resource/DomainResolverService.java b/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/services/resource/DomainResolverService.java
index 530959dcf21b4c7fa626f3dedc6cc6e14c75671c..4b381614288bc4878b26e5b60c2825f78d0e1186 100644
--- a/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/services/resource/DomainResolverService.java
+++ b/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/services/resource/DomainResolverService.java
@@ -2,7 +2,7 @@
* #START_LICENSE#
* smp-server-library
* %%
- * Copyright (C) 2017 - 2023 European Commission | eDelivery | DomiSMP
+ * Copyright (C) 2017 - 2024 European Commission | eDelivery | DomiSMP
* %%
* Licensed under the EUPL, Version 1.2 or – as soon they will be approved by the European Commission - subsequent
* versions of the EUPL (the "Licence");
diff --git a/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/services/resource/ResolvedData.java b/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/services/resource/ResolvedData.java
index 4639cff044c30705c9df3da50f302ff5d7785175..15e5d2c68b10721b675632ca2510cdce4c3e404f 100644
--- a/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/services/resource/ResolvedData.java
+++ b/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/services/resource/ResolvedData.java
@@ -2,7 +2,7 @@
* #START_LICENSE#
* smp-server-library
* %%
- * Copyright (C) 2017 - 2023 European Commission | eDelivery | DomiSMP
+ * Copyright (C) 2017 - 2024 European Commission | eDelivery | DomiSMP
* %%
* Licensed under the EUPL, Version 1.2 or – as soon they will be approved by the European Commission - subsequent
* versions of the EUPL (the "Licence");
diff --git a/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/services/resource/ResourceHandlerService.java b/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/services/resource/ResourceHandlerService.java
index 68f57946872cef05de9523e50ffbb1fd4ae89677..bab20637e86f333953200a7c0e7f0642d4f65ada 100644
--- a/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/services/resource/ResourceHandlerService.java
+++ b/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/services/resource/ResourceHandlerService.java
@@ -2,7 +2,7 @@
* #START_LICENSE#
* smp-server-library
* %%
- * Copyright (C) 2017 - 2023 European Commission | eDelivery | DomiSMP
+ * Copyright (C) 2017 - 2024 European Commission | eDelivery | DomiSMP
* %%
* Licensed under the EUPL, Version 1.2 or – as soon they will be approved by the European Commission - subsequent
* versions of the EUPL (the "Licence");
diff --git a/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/services/resource/ResourceResolverService.java b/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/services/resource/ResourceResolverService.java
index 9123e2feefa62d1e94061669bb36b060f13bda68..5fb63bf0abe04e02cdc08df207af700341e03be6 100644
--- a/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/services/resource/ResourceResolverService.java
+++ b/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/services/resource/ResourceResolverService.java
@@ -2,7 +2,7 @@
* #START_LICENSE#
* smp-server-library
* %%
- * Copyright (C) 2017 - 2023 European Commission | eDelivery | DomiSMP
+ * Copyright (C) 2017 - 2024 European Commission | eDelivery | DomiSMP
* %%
* Licensed under the EUPL, Version 1.2 or – as soon they will be approved by the European Commission - subsequent
* versions of the EUPL (the "Licence");
diff --git a/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/services/resource/ResourceService.java b/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/services/resource/ResourceService.java
index e0d089a3ec9797aa6868bca21425a707c85a7f30..164241615012900f243672808bfc8b79d393f714 100644
--- a/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/services/resource/ResourceService.java
+++ b/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/services/resource/ResourceService.java
@@ -2,7 +2,7 @@
* #START_LICENSE#
* smp-server-library
* %%
- * Copyright (C) 2017 - 2023 European Commission | eDelivery | DomiSMP
+ * Copyright (C) 2017 - 2024 European Commission | eDelivery | DomiSMP
* %%
* Licensed under the EUPL, Version 1.2 or – as soon they will be approved by the European Commission - subsequent
* versions of the EUPL (the "Licence");
diff --git a/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/services/resource/ResourceStorage.java b/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/services/resource/ResourceStorage.java
index 20079c4ea356eaafa8b7b095af51532d4cf47300..cb297d3a8a82be2d0926ffc85e77677d578177c0 100644
--- a/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/services/resource/ResourceStorage.java
+++ b/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/services/resource/ResourceStorage.java
@@ -2,7 +2,7 @@
* #START_LICENSE#
* smp-server-library
* %%
- * Copyright (C) 2017 - 2023 European Commission | eDelivery | DomiSMP
+ * Copyright (C) 2017 - 2024 European Commission | eDelivery | DomiSMP
* %%
* Licensed under the EUPL, Version 1.2 or – as soon they will be approved by the European Commission - subsequent
* versions of the EUPL (the "Licence");
diff --git a/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/services/spi/SPIUtils.java b/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/services/spi/SPIUtils.java
index 8b4349bfd6ceb09b50409cd859140e9f0cdb677f..8c2476fa07b0b22860f90e02f368154367950d6b 100644
--- a/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/services/spi/SPIUtils.java
+++ b/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/services/spi/SPIUtils.java
@@ -2,7 +2,7 @@
* #START_LICENSE#
* smp-server-library
* %%
- * Copyright (C) 2017 - 2023 European Commission | eDelivery | DomiSMP
+ * Copyright (C) 2017 - 2024 European Commission | eDelivery | DomiSMP
* %%
* Licensed under the EUPL, Version 1.2 or – as soon they will be approved by the European Commission - subsequent
* versions of the EUPL (the "Licence");
diff --git a/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/services/spi/SmpDataService.java b/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/services/spi/SmpDataService.java
index 6408c1bc67659b525bff6b37d59baa87345cc20c..23479ab18cd2afcd7634bf56f8c01ee2e617a86b 100644
--- a/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/services/spi/SmpDataService.java
+++ b/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/services/spi/SmpDataService.java
@@ -2,7 +2,7 @@
* #START_LICENSE#
* smp-server-library
* %%
- * Copyright (C) 2017 - 2023 European Commission | eDelivery | DomiSMP
+ * Copyright (C) 2017 - 2024 European Commission | eDelivery | DomiSMP
* %%
* Licensed under the EUPL, Version 1.2 or – as soon they will be approved by the European Commission - subsequent
* versions of the EUPL (the "Licence");
diff --git a/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/services/spi/SmpIdentifierService.java b/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/services/spi/SmpIdentifierService.java
index 07f4d6829ce90aa0317a7c3cc692cb58b9e71a6f..62e0a5e9c3306a66f15355eea62249b717064ebf 100644
--- a/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/services/spi/SmpIdentifierService.java
+++ b/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/services/spi/SmpIdentifierService.java
@@ -2,7 +2,7 @@
* #START_LICENSE#
* smp-server-library
* %%
- * Copyright (C) 2017 - 2023 European Commission | eDelivery | DomiSMP
+ * Copyright (C) 2017 - 2024 European Commission | eDelivery | DomiSMP
* %%
* Licensed under the EUPL, Version 1.2 or – as soon they will be approved by the European Commission - subsequent
* versions of the EUPL (the "Licence");
diff --git a/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/services/spi/SmpXmlSignatureService.java b/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/services/spi/SmpXmlSignatureService.java
index 0e76df741d95f4f874aff0669a8c372d181dfaf6..947c41126a847f9ec79c99359016d2b402fe5857 100644
--- a/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/services/spi/SmpXmlSignatureService.java
+++ b/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/services/spi/SmpXmlSignatureService.java
@@ -2,7 +2,7 @@
* #START_LICENSE#
* smp-webapp
* %%
- * Copyright (C) 2017 - 2023 European Commission | eDelivery | DomiSMP
+ * Copyright (C) 2017 - 2024 European Commission | eDelivery | DomiSMP
* %%
* Licensed under the EUPL, Version 1.2 or – as soon they will be approved by the European Commission - subsequent
* versions of the EUPL (the "Licence");
diff --git a/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/services/spi/data/SpiRequestData.java b/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/services/spi/data/SpiRequestData.java
index d889fef79312b5917b46f10eb10e7a593ad73eb4..35c83e7c2b8d64034b883eb64e9ff7a2cc289ba3 100644
--- a/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/services/spi/data/SpiRequestData.java
+++ b/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/services/spi/data/SpiRequestData.java
@@ -2,7 +2,7 @@
* #START_LICENSE#
* smp-server-library
* %%
- * Copyright (C) 2017 - 2023 European Commission | eDelivery | DomiSMP
+ * Copyright (C) 2017 - 2024 European Commission | eDelivery | DomiSMP
* %%
* Licensed under the EUPL, Version 1.2 or – as soon they will be approved by the European Commission - subsequent
* versions of the EUPL (the "Licence");
diff --git a/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/services/spi/data/SpiResponseData.java b/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/services/spi/data/SpiResponseData.java
index 4e31d8d68475b85e0b98587dca6a3a0d6ab8686a..e6f7e651cb2ec36d699bc1d1f0aa17207cc0dc47 100644
--- a/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/services/spi/data/SpiResponseData.java
+++ b/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/services/spi/data/SpiResponseData.java
@@ -2,7 +2,7 @@
* #START_LICENSE#
* smp-server-library
* %%
- * Copyright (C) 2017 - 2023 European Commission | eDelivery | DomiSMP
+ * Copyright (C) 2017 - 2024 European Commission | eDelivery | DomiSMP
* %%
* Licensed under the EUPL, Version 1.2 or – as soon they will be approved by the European Commission - subsequent
* versions of the EUPL (the "Licence");
diff --git a/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/services/ui/BasicKeystoreService.java b/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/services/ui/BasicKeystoreService.java
index 653b874ddc64b5c0ab307b76d3383e98bcad7818..4d4ead926ca26cc8bb1d3d3848a6d27c4fa84e69 100644
--- a/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/services/ui/BasicKeystoreService.java
+++ b/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/services/ui/BasicKeystoreService.java
@@ -2,7 +2,7 @@
* #START_LICENSE#
* smp-server-library
* %%
- * Copyright (C) 2017 - 2023 European Commission | eDelivery | DomiSMP
+ * Copyright (C) 2017 - 2024 European Commission | eDelivery | DomiSMP
* %%
* Licensed under the EUPL, Version 1.2 or – as soon they will be approved by the European Commission - subsequent
* versions of the EUPL (the "Licence");
diff --git a/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/services/ui/UIAlertService.java b/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/services/ui/UIAlertService.java
index e90eb1d7c053d80003b38f4d693d0f45e48d5281..6811876f55db4dff7eaa1a17b49e703d1c0bf494 100644
--- a/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/services/ui/UIAlertService.java
+++ b/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/services/ui/UIAlertService.java
@@ -2,7 +2,7 @@
* #START_LICENSE#
* smp-server-library
* %%
- * Copyright (C) 2017 - 2023 European Commission | eDelivery | DomiSMP
+ * Copyright (C) 2017 - 2024 European Commission | eDelivery | DomiSMP
* %%
* Licensed under the EUPL, Version 1.2 or – as soon they will be approved by the European Commission - subsequent
* versions of the EUPL (the "Licence");
diff --git a/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/services/ui/UIDocumentService.java b/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/services/ui/UIDocumentService.java
index a53421688d3d5bd96910b6788298bb37f651c450..efe5fb109fd401cc14db8d6d352187a855cebe80 100644
--- a/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/services/ui/UIDocumentService.java
+++ b/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/services/ui/UIDocumentService.java
@@ -2,7 +2,7 @@
* #START_LICENSE#
* smp-server-library
* %%
- * Copyright (C) 2017 - 2023 European Commission | eDelivery | DomiSMP
+ * Copyright (C) 2017 - 2024 European Commission | eDelivery | DomiSMP
* %%
* Licensed under the EUPL, Version 1.2 or – as soon they will be approved by the European Commission - subsequent
* versions of the EUPL (the "Licence");
diff --git a/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/services/ui/UIDomainPublicService.java b/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/services/ui/UIDomainPublicService.java
index 0a925709b8b4885fa5e59f8d94ff1210fd3a96c5..a681f9726e019ec34441e111e7c0f658ec1d0e07 100644
--- a/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/services/ui/UIDomainPublicService.java
+++ b/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/services/ui/UIDomainPublicService.java
@@ -2,7 +2,7 @@
* #START_LICENSE#
* smp-server-library
* %%
- * Copyright (C) 2017 - 2023 European Commission | eDelivery | DomiSMP
+ * Copyright (C) 2017 - 2024 European Commission | eDelivery | DomiSMP
* %%
* Licensed under the EUPL, Version 1.2 or – as soon they will be approved by the European Commission - subsequent
* versions of the EUPL (the "Licence");
diff --git a/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/services/ui/UIDomainService.java b/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/services/ui/UIDomainService.java
index 2ea8bf73d9f016fcf17623c0536b41612947e7ea..adc5c255053b2e20df0fcdff854199f8cc584792 100644
--- a/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/services/ui/UIDomainService.java
+++ b/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/services/ui/UIDomainService.java
@@ -2,7 +2,7 @@
* #START_LICENSE#
* smp-server-library
* %%
- * Copyright (C) 2017 - 2023 European Commission | eDelivery | DomiSMP
+ * Copyright (C) 2017 - 2024 European Commission | eDelivery | DomiSMP
* %%
* Licensed under the EUPL, Version 1.2 or – as soon they will be approved by the European Commission - subsequent
* versions of the EUPL (the "Licence");
diff --git a/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/services/ui/UIExtensionService.java b/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/services/ui/UIExtensionService.java
index 323667ae1ad5051be75e0e2fbaa8c7c206679407..7d3f0b2d24cb3592c3bccd5ae10f212d6e6d6b20 100644
--- a/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/services/ui/UIExtensionService.java
+++ b/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/services/ui/UIExtensionService.java
@@ -2,7 +2,7 @@
* #START_LICENSE#
* smp-server-library
* %%
- * Copyright (C) 2017 - 2023 European Commission | eDelivery | DomiSMP
+ * Copyright (C) 2017 - 2024 European Commission | eDelivery | DomiSMP
* %%
* Licensed under the EUPL, Version 1.2 or – as soon they will be approved by the European Commission - subsequent
* versions of the EUPL (the "Licence");
diff --git a/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/services/ui/UIGroupPublicService.java b/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/services/ui/UIGroupPublicService.java
index 521b472d174612a54567fe045ed7564762ce02ad..90d3af9a20971e1a0815347cb364fa39207107b9 100644
--- a/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/services/ui/UIGroupPublicService.java
+++ b/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/services/ui/UIGroupPublicService.java
@@ -2,7 +2,7 @@
* #START_LICENSE#
* smp-server-library
* %%
- * Copyright (C) 2017 - 2023 European Commission | eDelivery | DomiSMP
+ * Copyright (C) 2017 - 2024 European Commission | eDelivery | DomiSMP
* %%
* Licensed under the EUPL, Version 1.2 or – as soon they will be approved by the European Commission - subsequent
* versions of the EUPL (the "Licence");
diff --git a/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/services/ui/UIKeystoreService.java b/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/services/ui/UIKeystoreService.java
index 5a5566a6cc74c3d2d7008c3ded8295fe4129a035..f4e842296a7451786ad58b9c3712f91a0c4fa2c8 100644
--- a/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/services/ui/UIKeystoreService.java
+++ b/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/services/ui/UIKeystoreService.java
@@ -2,7 +2,7 @@
* #START_LICENSE#
* smp-server-library
* %%
- * Copyright (C) 2017 - 2023 European Commission | eDelivery | DomiSMP
+ * Copyright (C) 2017 - 2024 European Commission | eDelivery | DomiSMP
* %%
* Licensed under the EUPL, Version 1.2 or – as soon they will be approved by the European Commission - subsequent
* versions of the EUPL (the "Licence");
diff --git a/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/services/ui/UIPropertyService.java b/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/services/ui/UIPropertyService.java
index c9bf4fa3fc6138e5290165cd9a5959dcd2a61dfa..36ad56533a1d58e165638886905b1d14dde0b97a 100644
--- a/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/services/ui/UIPropertyService.java
+++ b/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/services/ui/UIPropertyService.java
@@ -2,7 +2,7 @@
* #START_LICENSE#
* smp-server-library
* %%
- * Copyright (C) 2017 - 2023 European Commission | eDelivery | DomiSMP
+ * Copyright (C) 2017 - 2024 European Commission | eDelivery | DomiSMP
* %%
* Licensed under the EUPL, Version 1.2 or – as soon they will be approved by the European Commission - subsequent
* versions of the EUPL (the "Licence");
@@ -125,7 +125,7 @@ public class UIPropertyService {
property.setNewValue(changedProps.get(propertyType.getProperty()).getValue());
property.setUpdateDate(refreshPropertiesTrigger.getNextExecutionDate());
} else {
- LOG.debug("Property [{}] has newer update time, but it has the same value as the current value!");
+ LOG.debug("Property [{}] has newer update time, but it has the same value as the current value!", propertyType);
}
}
return property;
diff --git a/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/services/ui/UIResourceSearchService.java b/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/services/ui/UIResourceSearchService.java
index 963a4bc5353036b3b889240d7702f131a480dcc9..df80781d4f0f0e608b82c01b74bbeea448cd2bb1 100644
--- a/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/services/ui/UIResourceSearchService.java
+++ b/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/services/ui/UIResourceSearchService.java
@@ -2,7 +2,7 @@
* #START_LICENSE#
* smp-server-library
* %%
- * Copyright (C) 2017 - 2023 European Commission | eDelivery | DomiSMP
+ * Copyright (C) 2017 - 2024 European Commission | eDelivery | DomiSMP
* %%
* Licensed under the EUPL, Version 1.2 or – as soon they will be approved by the European Commission - subsequent
* versions of the EUPL (the "Licence");
diff --git a/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/services/ui/UIResourceService.java b/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/services/ui/UIResourceService.java
index fc934db7cebb83c2d8e175a222efad372f4ab43d..b627a3f3d4546be21bb44ae0c070ce8f9fcbae66 100644
--- a/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/services/ui/UIResourceService.java
+++ b/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/services/ui/UIResourceService.java
@@ -2,7 +2,7 @@
* #START_LICENSE#
* smp-server-library
* %%
- * Copyright (C) 2017 - 2023 European Commission | eDelivery | DomiSMP
+ * Copyright (C) 2017 - 2024 European Commission | eDelivery | DomiSMP
* %%
* Licensed under the EUPL, Version 1.2 or – as soon they will be approved by the European Commission - subsequent
* versions of the EUPL (the "Licence");
diff --git a/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/services/ui/UIServiceBase.java b/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/services/ui/UIServiceBase.java
index 9943d468d675229cc36520a10927351b2ac4d333..8dd9332dc27be2f078a498346694f95b6c6f2662 100644
--- a/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/services/ui/UIServiceBase.java
+++ b/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/services/ui/UIServiceBase.java
@@ -2,7 +2,7 @@
* #START_LICENSE#
* smp-server-library
* %%
- * Copyright (C) 2017 - 2023 European Commission | eDelivery | DomiSMP
+ * Copyright (C) 2017 - 2024 European Commission | eDelivery | DomiSMP
* %%
* Licensed under the EUPL, Version 1.2 or – as soon they will be approved by the European Commission - subsequent
* versions of the EUPL (the "Licence");
diff --git a/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/services/ui/UISubresourceService.java b/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/services/ui/UISubresourceService.java
index 909f01deb683e89b6854ad163caace11d69287ba..8ecb84b1d8d24829c7aa5870b60513e15db6d1b4 100644
--- a/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/services/ui/UISubresourceService.java
+++ b/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/services/ui/UISubresourceService.java
@@ -2,7 +2,7 @@
* #START_LICENSE#
* smp-server-library
* %%
- * Copyright (C) 2017 - 2023 European Commission | eDelivery | DomiSMP
+ * Copyright (C) 2017 - 2024 European Commission | eDelivery | DomiSMP
* %%
* Licensed under the EUPL, Version 1.2 or – as soon they will be approved by the European Commission - subsequent
* versions of the EUPL (the "Licence");
diff --git a/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/services/ui/UITruststoreService.java b/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/services/ui/UITruststoreService.java
index 88625ad60d25dccbec62a77f3e399fda6e838597..60ce2a0ad12116b6de94e7089ff53cff82798678 100644
--- a/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/services/ui/UITruststoreService.java
+++ b/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/services/ui/UITruststoreService.java
@@ -2,7 +2,7 @@
* #START_LICENSE#
* smp-server-library
* %%
- * Copyright (C) 2017 - 2023 European Commission | eDelivery | DomiSMP
+ * Copyright (C) 2017 - 2024 European Commission | eDelivery | DomiSMP
* %%
* Licensed under the EUPL, Version 1.2 or – as soon they will be approved by the European Commission - subsequent
* versions of the EUPL (the "Licence");
@@ -71,11 +71,6 @@ public class UITruststoreService extends BasicKeystoreService {
private static final SMPLogger LOG = SMPLoggerFactory.getLogger(UITruststoreService.class);
-
- private static final ThreadLocal<DateFormat> dateFormatLocal = ThreadLocal.withInitial(() ->
- new SimpleDateFormat("MMM d hh:mm:ss yyyy zzz", US)
- );
-
// dependent beans
private final ConfigurationService configurationService;
private final ConversionService conversionService;
@@ -367,50 +362,6 @@ public class UITruststoreService extends BasicKeystoreService {
}
}
- /**
- * The legacy certificate validation. The validation is done only certificate metadata
- *
- * @param cert
- * @throws CertificateException
- *
- public void checkFullCertificateValidityLegacy(CertificateRO cert) throws CertificateException {
- // trust data in database
- if (cert.getValidFrom() != null && OffsetDateTime.now().isBefore(cert.getValidFrom())) {
- throw new CertificateNotYetValidException("Certificate: " + cert.getCertificateId() + " is valid from: "
- + dateFormatLocal.get().format(cert.getValidFrom()) + ".");
-
- }
- if (cert.getValidTo() != null && OffsetDateTime.now().isAfter(cert.getValidTo())) {
- throw new CertificateExpiredException("Certificate: " + cert.getCertificateId() + " was valid to: "
- + dateFormatLocal.get().format(cert.getValidTo()) + ".");
- }
- // if trusted list is not empty and exists issuer or subject then validate
- if (!normalizedTrustedList.isEmpty() && (
- !StringUtils.isBlank(cert.getIssuer()) || !StringUtils.isBlank(cert.getSubject()))) {
-
- if (!isSubjectOnTrustedList(cert.getIssuer()) && !isSubjectOnTrustedList(cert.getSubject())) {
- throw new CertificateNotTrustedException(CERT_ERROR_MSG_NOT_TRUSTED);
- }
- }
-
- // Check crl list
- String url = cert.getCrlUrl();
- if (!StringUtils.isBlank(url) && !StringUtils.isBlank(cert.getSerialNumber())) {
- try {
- crlVerifierService.verifyCertificateCRLs(cert.getSerialNumber(), url);
- } catch (CertificateRevokedException ex) {
- String msg = "Certificate: '" + cert.getCertificateId() + "'" +
- " is revoked!";
- LOG.securityWarn(SEC_USER_CERT_INVALID, cert.getCertificateId(), msg, ex);
- throw new CertificateException(msg);
- } catch (Throwable th) {
- String msg = "Error occurred while validating CRL for certificate!";
- LOG.error(SMPLogger.SECURITY_MARKER, msg + "Err: " + ExceptionUtils.getRootCauseMessage(th), th);
- throw new CertificateException(msg);
- }
- }
- }
-*/
boolean isTruststoreChanged() {
File file = getTruststoreFile();
return !Objects.equals(lastUpdateTrustStoreFile, file) ||
diff --git a/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/services/ui/UIUserService.java b/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/services/ui/UIUserService.java
index fb3d3b72e1972d9ac9b5743c460d167768bc227c..62599cc6efa74b5a0cf87a0b399d10a5dd7645e0 100644
--- a/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/services/ui/UIUserService.java
+++ b/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/services/ui/UIUserService.java
@@ -2,7 +2,7 @@
* #START_LICENSE#
* smp-server-library
* %%
- * Copyright (C) 2017 - 2023 European Commission | eDelivery | DomiSMP
+ * Copyright (C) 2017 - 2024 European Commission | eDelivery | DomiSMP
* %%
* Licensed under the EUPL, Version 1.2 or – as soon they will be approved by the European Commission - subsequent
* versions of the EUPL (the "Licence");
@@ -67,6 +67,7 @@ import java.util.stream.Collectors;
public class UIUserService extends UIServiceBase<DBUser, UserRO> {
private static final SMPLogger LOG = SMPLoggerFactory.getLogger(UIUserService.class);
+ private static final String USER_ID_REQUEST_TYPE = "UserId";
private final UserDao userDao;
CredentialDao credentialDao;
@@ -107,8 +108,7 @@ public class UIUserService extends UIServiceBase<DBUser, UserRO> {
@Transactional
@Override
public ServiceResult<UserRO> getTableList(int page, int pageSize, String sortField, String sortOrder, Object filter) {
- ServiceResult<UserRO> resUsers = super.getTableList(page, pageSize, sortField, sortOrder, filter);
- return resUsers;
+ return super.getTableList(page, pageSize, sortField, sortOrder, filter);
}
public AccessTokenRO createAccessTokenForUser(Long userId, CredentialRO credInit) {
@@ -116,11 +116,10 @@ public class UIUserService extends UIServiceBase<DBUser, UserRO> {
DBUser dbUser = userDao.find(userId);
if (dbUser == null) {
LOG.error("Can not update user password because authorized user with id [{}] does not exist!", userId);
- throw new SMPRuntimeException(ErrorCode.INVALID_REQUEST, "UserId", "Can not find user id!");
+ throw new SMPRuntimeException(ErrorCode.INVALID_REQUEST, USER_ID_REQUEST_TYPE, "Can not find user id!");
}
- Boolean testMode = SMPEnvironmentProperties.getInstance().isSMPStartupInDevMode();
-
+ boolean testMode = SMPEnvironmentProperties.getInstance().isSMPStartupInDevMode();
AccessTokenRO token = generateAccessToken(testMode);
OffsetDateTime generatedTime = token.getGeneratedOn();
OffsetDateTime expireOnTime = generatedTime.plusDays(configurationService.getAccessTokenPolicyValidDays());
@@ -160,7 +159,7 @@ public class UIUserService extends UIServiceBase<DBUser, UserRO> {
DBUser dbUser = userDao.find(userId);
if (dbUser == null) {
LOG.error("Can not update user password because authorized user with id [{}] does not exist!", userId);
- throw new SMPRuntimeException(ErrorCode.INVALID_REQUEST, "UserId", "Can not find user id!");
+ throw new SMPRuntimeException(ErrorCode.INVALID_REQUEST, USER_ID_REQUEST_TYPE, "Can not find user id!");
}
CertificateRO certificate = credential.getCertificate();
if (certificate == null || StringUtils.isBlank(certificate.getCertificateId())) {
@@ -211,7 +210,7 @@ public class UIUserService extends UIServiceBase<DBUser, UserRO> {
}
Optional<DBCredential> dbCredential = credentialDao.findUsernamePasswordCredentialForUserIdAndUI(authorizedUserId);
DBCredential dbAuthorizedCredentials = dbCredential.orElseThrow(() ->
- new SMPRuntimeException(ErrorCode.INVALID_REQUEST, "UserId", "Can not find user id"));
+ new SMPRuntimeException(ErrorCode.INVALID_REQUEST, USER_ID_REQUEST_TYPE, "Can not find user id"));
DBUser authorizedUser = dbAuthorizedCredentials.getUser();
@@ -280,7 +279,7 @@ public class UIUserService extends UIServiceBase<DBUser, UserRO> {
DBUser dbUserToUpdate = userDao.find(userID);
if (dbUserToUpdate == null) {
LOG.error("Can not update user password because user,[{}] does not exist!", userID);
- throw new SMPRuntimeException(ErrorCode.INVALID_REQUEST, "UserId", "Can not find user id to update!");
+ throw new SMPRuntimeException(ErrorCode.INVALID_REQUEST, USER_ID_REQUEST_TYPE, "Can not find user id to update!");
}
DBCredential credential = new DBCredential();
credential.setUser(dbUserToUpdate);
@@ -316,7 +315,7 @@ public class UIUserService extends UIServiceBase<DBUser, UserRO> {
DBUser dbUser = userDao.find(userId);
if (dbUser == null) {
LOG.error("Can not update user because user for id [{}] does not exist!", userId);
- throw new SMPRuntimeException(ErrorCode.INVALID_REQUEST, "UserId", "Can not find user id!");
+ throw new SMPRuntimeException(ErrorCode.INVALID_REQUEST, USER_ID_REQUEST_TYPE, "Can not find user id!");
}
LOG.debug("Update user [{}]: email [{}], fullName [{}], smp theme [{}]", user.getUsername(), user.getEmailAddress(), user.getFullName(), user.getSmpTheme());
// update user profile data on managed db entity. (For now Just email, name and theme)
@@ -331,7 +330,7 @@ public class UIUserService extends UIServiceBase<DBUser, UserRO> {
DBUser dbUser = userDao.find(userId);
if (dbUser == null) {
LOG.error("Can not update user because user for id [{}] does not exist!", userId);
- throw new SMPRuntimeException(ErrorCode.INVALID_REQUEST, "UserId", "Can not find user id!");
+ throw new SMPRuntimeException(ErrorCode.INVALID_REQUEST, USER_ID_REQUEST_TYPE, "Can not find user id!");
}
LOG.debug("Update user [{}]: email [{}], fullName [{}], smp theme [{}]", user.getUsername(), user.getEmailAddress(), user.getFullName(), user.getSmpTheme());
// update user data by admin
@@ -377,7 +376,7 @@ public class UIUserService extends UIServiceBase<DBUser, UserRO> {
DBUser dbUser = userDao.find(userId);
if (dbUser == null) {
LOG.error("Can not delete user because user for id [{}] does not exist!", userId);
- throw new SMPRuntimeException(ErrorCode.INVALID_REQUEST, "UserId", "Can not find user id!");
+ throw new SMPRuntimeException(ErrorCode.INVALID_REQUEST, USER_ID_REQUEST_TYPE, "Can not find user id!");
}
userDao.remove(dbUser);
return conversionService.convert(dbUser, UserRO.class);
@@ -398,9 +397,7 @@ public class UIUserService extends UIServiceBase<DBUser, UserRO> {
@Transactional(readOnly = true)
public UserRO getUserById(Long userId) {
DBUser user = userDao.findUser(userId).orElseThrow(() -> new SMPRuntimeException(ErrorCode.USER_NOT_EXISTS));
- UserRO result = convertToRo(user);
-
- return result;
+ return convertToRo(user);
}
public List<CredentialRO> getUserCredentials(Long userId,
@@ -411,9 +408,8 @@ public class UIUserService extends UIServiceBase<DBUser, UserRO> {
List<DBCredential> credentialROs = credentialDao
.findUserCredentialForByUserIdTypeAndTarget(userId, credentialType, credentialTargetType);
- List<CredentialRO> credentialROList = credentialROs.stream().map(this::convertAndValidateCertificateCredential)
+ return credentialROs.stream().map(this::convertAndValidateCertificateCredential)
.collect(Collectors.toList());
- return credentialROList;
}
public CredentialRO convertAndValidateCertificateCredential(DBCredential credential) {
@@ -464,7 +460,7 @@ public class UIUserService extends UIServiceBase<DBUser, UserRO> {
protected void validateCredentials(DBCredential credential, Long userId, CredentialType credentialType, CredentialTargetType credentialTargetType) {
if (credential == null) {
- LOG.warn("Can not delete credential for ID [{}], because it does not exists!");
+ LOG.warn("Can not delete credential for ID [{}], because it does not exists!", userId);
throw new BadRequestException(ErrorBusinessCode.UNAUTHORIZED, "Credential does not exist!");
}
// validate data
diff --git a/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/services/ui/filters/ResourceFilter.java b/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/services/ui/filters/ResourceFilter.java
index 12ab12a7e6b13bb879fd004680c71dcec430bd94..79e0417160192d7395c1e30d15727437fcb0e9f1 100644
--- a/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/services/ui/filters/ResourceFilter.java
+++ b/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/services/ui/filters/ResourceFilter.java
@@ -2,7 +2,7 @@
* #START_LICENSE#
* smp-server-library
* %%
- * Copyright (C) 2017 - 2023 European Commission | eDelivery | DomiSMP
+ * Copyright (C) 2017 - 2024 European Commission | eDelivery | DomiSMP
* %%
* Licensed under the EUPL, Version 1.2 or – as soon they will be approved by the European Commission - subsequent
* versions of the EUPL (the "Licence");
diff --git a/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/services/ui/filters/UserFilter.java b/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/services/ui/filters/UserFilter.java
index f9f3b94124e45d85048e7fa95226170a72c035b5..b708356fd7e61b229d2990303b51fd8e7df38078 100644
--- a/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/services/ui/filters/UserFilter.java
+++ b/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/services/ui/filters/UserFilter.java
@@ -2,7 +2,7 @@
* #START_LICENSE#
* smp-server-library
* %%
- * Copyright (C) 2017 - 2023 European Commission | eDelivery | DomiSMP
+ * Copyright (C) 2017 - 2024 European Commission | eDelivery | DomiSMP
* %%
* Licensed under the EUPL, Version 1.2 or – as soon they will be approved by the European Commission - subsequent
* versions of the EUPL (the "Licence");
diff --git a/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/servlet/ResourceAction.java b/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/servlet/ResourceAction.java
index 240b41b647e3f13308ab871c8e273c7cefa3edbd..a5d9ece81a0d9f8e055078d05741726319ceb51f 100644
--- a/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/servlet/ResourceAction.java
+++ b/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/servlet/ResourceAction.java
@@ -2,7 +2,7 @@
* #START_LICENSE#
* smp-server-library
* %%
- * Copyright (C) 2017 - 2023 European Commission | eDelivery | DomiSMP
+ * Copyright (C) 2017 - 2024 European Commission | eDelivery | DomiSMP
* %%
* Licensed under the EUPL, Version 1.2 or – as soon they will be approved by the European Commission - subsequent
* versions of the EUPL (the "Licence");
diff --git a/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/servlet/ResourceRequest.java b/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/servlet/ResourceRequest.java
index 92fe00922cb94b8a47562a4d307d9f7b02d42c0a..fdd6059052cb56bc9ef3d6d7d5e123bdab024a05 100644
--- a/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/servlet/ResourceRequest.java
+++ b/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/servlet/ResourceRequest.java
@@ -2,7 +2,7 @@
* #START_LICENSE#
* smp-server-library
* %%
- * Copyright (C) 2017 - 2023 European Commission | eDelivery | DomiSMP
+ * Copyright (C) 2017 - 2024 European Commission | eDelivery | DomiSMP
* %%
* Licensed under the EUPL, Version 1.2 or – as soon they will be approved by the European Commission - subsequent
* versions of the EUPL (the "Licence");
diff --git a/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/servlet/ResourceResponse.java b/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/servlet/ResourceResponse.java
index c0745ccfa1b879bc2f91ab65a41d2d5b19635b65..43931c104d6f68b16c2c5e3c190f653183f3cee0 100644
--- a/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/servlet/ResourceResponse.java
+++ b/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/servlet/ResourceResponse.java
@@ -2,7 +2,7 @@
* #START_LICENSE#
* smp-server-library
* %%
- * Copyright (C) 2017 - 2023 European Commission | eDelivery | DomiSMP
+ * Copyright (C) 2017 - 2024 European Commission | eDelivery | DomiSMP
* %%
* Licensed under the EUPL, Version 1.2 or – as soon they will be approved by the European Commission - subsequent
* versions of the EUPL (the "Licence");
diff --git a/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/servlet/WebConstants.java b/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/servlet/WebConstants.java
index d7ab8c28cef7271fa6280afa1abd23eec6e3d1ad..0b42b7206997b1661167a10a8782f9bb1e249e73 100644
--- a/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/servlet/WebConstants.java
+++ b/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/servlet/WebConstants.java
@@ -2,7 +2,7 @@
* #START_LICENSE#
* smp-server-library
* %%
- * Copyright (C) 2017 - 2023 European Commission | eDelivery | DomiSMP
+ * Copyright (C) 2017 - 2024 European Commission | eDelivery | DomiSMP
* %%
* Licensed under the EUPL, Version 1.2 or – as soon they will be approved by the European Commission - subsequent
* versions of the EUPL (the "Licence");
diff --git a/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/sml/SmlClientFactory.java b/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/sml/SmlClientFactory.java
index 056d36b244ecb88f090baf83a12b86ebccb2c243..4c30a85b6aa8b24b1f8f0d829919a7ef4430885a 100644
--- a/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/sml/SmlClientFactory.java
+++ b/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/sml/SmlClientFactory.java
@@ -2,7 +2,7 @@
* #START_LICENSE#
* smp-webapp
* %%
- * Copyright (C) 2017 - 2023 European Commission | eDelivery | DomiSMP
+ * Copyright (C) 2017 - 2024 European Commission | eDelivery | DomiSMP
* %%
* Licensed under the EUPL, Version 1.2 or – as soon they will be approved by the European Commission - subsequent
* versions of the EUPL (the "Licence");
diff --git a/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/sml/SmlConnector.java b/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/sml/SmlConnector.java
index fbcdd429a374afb02efa1968e2b50199c5d7c852..a923e266c10f7d701871cc81789c5337dc712847 100644
--- a/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/sml/SmlConnector.java
+++ b/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/sml/SmlConnector.java
@@ -2,15 +2,15 @@
* #START_LICENSE#
* smp-webapp
* %%
- * Copyright (C) 2017 - 2023 European Commission | eDelivery | DomiSMP
+ * Copyright (C) 2017 - 2024 European Commission | eDelivery | DomiSMP
* %%
* Licensed under the EUPL, Version 1.2 or – as soon they will be approved by the European Commission - subsequent
* versions of the EUPL (the "Licence");
* You may not use this work except in compliance with the Licence.
* You may obtain a copy of the Licence at:
- *
+ *
* [PROJECT_HOME]\license\eupl-1.2\license.txt or https://joinup.ec.europa.eu/collection/eupl/eupl-text-eupl-12
- *
+ *
* Unless required by applicable law or agreed to in writing, software distributed under the Licence is
* distributed on an "AS IS" basis, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the Licence for the specific language governing permissions and limitations under the Licence.
@@ -52,7 +52,6 @@ import org.busdox.servicemetadata.locator._1.PublisherEndpointType;
import org.busdox.servicemetadata.locator._1.ServiceMetadataPublisherServiceForParticipantType;
import org.busdox.servicemetadata.locator._1.ServiceMetadataPublisherServiceType;
import org.springframework.beans.BeansException;
-import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.context.ApplicationContext;
import org.springframework.context.ApplicationContextAware;
import org.springframework.stereotype.Component;
@@ -79,24 +78,27 @@ public class SmlConnector implements ApplicationContextAware {
private static final String SERVICE_METADATA_CONTEXT = "manageservicemetadata";
private static final String IDENTIFIER_VALUE_CONTEXT = "manageparticipantidentifier";
-
private static final String BDMSL_CUSTOM_SERVICES_CONTEXT = "bdmslservice";
-
private static final String CLIENT_CERT_HEADER_KEY = "Client-Cert";
- @Autowired
- ConfigurationService configurationService;
- @Autowired
- UIKeystoreService keystoreService;
-
- @Autowired
- UITruststoreService truststoreService;
+ private final ConfigurationService configurationService;
+ private final UIKeystoreService keystoreService;
+ private final UITruststoreService truststoreService;
+ private final IdentifierService identifierService;
+ private ApplicationContext ctx;
- @Autowired
- IdentifierService identifierService;
+ public SmlConnector(ConfigurationService configurationService, UIKeystoreService keystoreService, UITruststoreService truststoreService, IdentifierService identifierService) {
+ this.configurationService = configurationService;
+ this.keystoreService = keystoreService;
+ this.truststoreService = truststoreService;
+ this.identifierService = identifierService;
+ }
- private ApplicationContext ctx;
+ @Override
+ public void setApplicationContext(ApplicationContext applicationContext) throws BeansException {
+ ctx = applicationContext;
+ }
public boolean registerInDns(Identifier normalizedParticipantId, DBDomain domain, String customNaptrService) {
if (!configurationService.isSMLIntegrationEnabled()) {
@@ -116,14 +118,12 @@ public class SmlConnector implements ApplicationContextAware {
LOG.info("Set regular DNS record for Participant: [{}] and domain: [{}].", normalizedParticipantId, domain.getDomainCode());
} else {
createCustomServiceNaptrDNSRecord(normalizedParticipantId, domain, customNaptrService);
- LOG.info("Set custom naptr service [{}] DNS record for Participant: [{}] and domain: [{}].", customNaptrService, normalizedParticipantId, domain.getDomainCode());
+ LOG.info("Set custom naptr service [{}] DNS record for Participant: [{}] and domain: [{}].", customNaptrService, normalizedParticipantId, domain.getDomainCode());
}
return true;
- } catch (BadRequestFault e) {
- return processSMLErrorMessage(e, normalizedParticipantId);
- } catch (NotFoundFault e) {
+ } catch (BadRequestFault | NotFoundFault e) {
return processSMLErrorMessage(e, normalizedParticipantId);
- } catch (Exception e) {
+ } catch (InternalErrorFault | UnauthorizedFault e) {
LOG.error(e.getClass().getName() + e.getMessage(), e);
throw new SMPRuntimeException(ErrorCode.SML_INTEGRATION_EXCEPTION, e, ExceptionUtils.getRootCauseMessage(e));
}
@@ -134,7 +134,7 @@ public class SmlConnector implements ApplicationContextAware {
* disabled, it returns {@code false}.
*
* @param normalizedParticipantId the participant ID
- * @param domain the domain entity
+ * @param domain the domain entity
* @return {@code true} if the participant exists; otherwise, {@code false} (also when SML integration is disabled).
*/
public boolean participantExists(Identifier normalizedParticipantId, DBDomain domain) {
@@ -195,7 +195,7 @@ public class SmlConnector implements ApplicationContextAware {
return false;
}
String exp = String.format(ERR_PARTICIPANT_ALREADY_EXISTS, patId.getValue(), patId.getScheme());
- String exp2 = String.format(ERR_PARTICIPANT_NOT_EXISTS, patId.getValue(), patId.getScheme());
+ String exp2 = ERR_PARTICIPANT_NOT_EXISTS;
return errorMessage.startsWith(exp) || errorMessage.startsWith(exp2);
}
@@ -304,9 +304,7 @@ public class SmlConnector implements ApplicationContextAware {
getParticipantWSClient(domain).delete(smlRequest);
LOG.info("Participant: {} removed domain: {}.", normalizedParticipantString, domain.getDomainCode());
return true;
- } catch (BadRequestFault e) {
- return processSMLErrorMessage(e, normalizedParticipantId);
- } catch (NotFoundFault e) {
+ } catch (BadRequestFault | NotFoundFault e) {
return processSMLErrorMessage(e, normalizedParticipantId);
} catch (Exception e) {
LOG.error(e.getClass().getName() + e.getMessage(), e);
@@ -321,9 +319,7 @@ public class SmlConnector implements ApplicationContextAware {
LOG.info("Removing SMP id (Domain) from BDMSL: {} ", domain.getDomainCode());
try {
getSMPManagerWSClient(domain).delete(domain.getSmlSmpId());
- } catch (BadRequestFault e) {
- processSMLErrorMessage(e, domain);
- } catch (NotFoundFault e) {
+ } catch (BadRequestFault | NotFoundFault e) {
processSMLErrorMessage(e, domain);
} catch (Exception e) {
LOG.error(e.getClass().getName() + e.getMessage(), e);
@@ -357,11 +353,6 @@ public class SmlConnector implements ApplicationContextAware {
return iManageServiceMetadataWS;
}
- @Override
- public void setApplicationContext(ApplicationContext applicationContext) throws BeansException {
- ctx = applicationContext;
- }
-
protected String getSmlClientKeyAliasForDomain(DBDomain domain) {
String alias = domain.getSmlClientKeyAlias();
if (!domain.isSmlClientCertAuth() && StringUtils.isBlank(alias)) {
@@ -428,7 +419,7 @@ public class SmlConnector implements ApplicationContextAware {
public void configureClientAuthentication(HTTPConduit httpConduit, Map<String, Object> requestContext, CertificateRO certificateRO, boolean clientCertAuthentication, boolean useTLS) {
LOG.info("Connect to SML (smlClientAuthentication: [{}] use Client-CertHeader: [{}])", certificateRO, clientCertAuthentication);
- if (certificateRO==null) {
+ if (certificateRO == null) {
throw new IllegalStateException("SML integration is wrongly configured, at least one authentication option is required: 2-way-SSL or Client-Cert header");
}
diff --git a/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/utils/BCryptPasswordHash.java b/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/utils/BCryptPasswordHash.java
index 96d2907df7c31cd9e3369d73d1e6a293650fdb8e..a72c5d713093d5d01acaa59ebfb2bf1e53702e44 100644
--- a/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/utils/BCryptPasswordHash.java
+++ b/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/utils/BCryptPasswordHash.java
@@ -2,7 +2,7 @@
* #START_LICENSE#
* smp-webapp
* %%
- * Copyright (C) 2017 - 2023 European Commission | eDelivery | DomiSMP
+ * Copyright (C) 2017 - 2024 European Commission | eDelivery | DomiSMP
* %%
* Licensed under the EUPL, Version 1.2 or – as soon they will be approved by the European Commission - subsequent
* versions of the EUPL (the "Licence");
diff --git a/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/utils/ExtLibraryClassLoader.java b/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/utils/ExtLibraryClassLoader.java
index eafb7ec92bc5df543a6a220adac4d10f6e9006fd..6c7e5d2ce7a996b1737066d4e8036b9c939028dc 100644
--- a/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/utils/ExtLibraryClassLoader.java
+++ b/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/utils/ExtLibraryClassLoader.java
@@ -2,7 +2,7 @@
* #START_LICENSE#
* smp-server-library
* %%
- * Copyright (C) 2017 - 2023 European Commission | eDelivery | DomiSMP
+ * Copyright (C) 2017 - 2024 European Commission | eDelivery | DomiSMP
* %%
* Licensed under the EUPL, Version 1.2 or – as soon they will be approved by the European Commission - subsequent
* versions of the EUPL (the "Licence");
diff --git a/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/utils/HttpForwardedHeaders.java b/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/utils/HttpForwardedHeaders.java
index 9f153903d803fd855f1871f62e5495f7d15fb566..0558daaae2614b15e6c92baf2fced0df3884129d 100644
--- a/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/utils/HttpForwardedHeaders.java
+++ b/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/utils/HttpForwardedHeaders.java
@@ -2,7 +2,7 @@
* #START_LICENSE#
* smp-server-library
* %%
- * Copyright (C) 2017 - 2023 European Commission | eDelivery | DomiSMP
+ * Copyright (C) 2017 - 2024 European Commission | eDelivery | DomiSMP
* %%
* Licensed under the EUPL, Version 1.2 or – as soon they will be approved by the European Commission - subsequent
* versions of the EUPL (the "Licence");
diff --git a/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/utils/HttpUtils.java b/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/utils/HttpUtils.java
index a85183a7eb42fbf3ca26f671d8b9369492fbbc99..07c2ba04ec3e7b1c0e122d816fe9127668cbef11 100644
--- a/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/utils/HttpUtils.java
+++ b/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/utils/HttpUtils.java
@@ -2,7 +2,7 @@
* #START_LICENSE#
* smp-server-library
* %%
- * Copyright (C) 2017 - 2023 European Commission | eDelivery | DomiSMP
+ * Copyright (C) 2017 - 2024 European Commission | eDelivery | DomiSMP
* %%
* Licensed under the EUPL, Version 1.2 or – as soon they will be approved by the European Commission - subsequent
* versions of the EUPL (the "Licence");
diff --git a/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/utils/PropertyUtils.java b/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/utils/PropertyUtils.java
index 05085c9a8b6156d79db3591ffd1023ea63495bc8..34d545f8b0e6a3e2f9302e27e47622e52778d9c1 100644
--- a/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/utils/PropertyUtils.java
+++ b/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/utils/PropertyUtils.java
@@ -2,7 +2,7 @@
* #START_LICENSE#
* smp-server-library
* %%
- * Copyright (C) 2017 - 2023 European Commission | eDelivery | DomiSMP
+ * Copyright (C) 2017 - 2024 European Commission | eDelivery | DomiSMP
* %%
* Licensed under the EUPL, Version 1.2 or – as soon they will be approved by the European Commission - subsequent
* versions of the EUPL (the "Licence");
@@ -49,8 +49,9 @@ public class PropertyUtils {
private static final String REG_EXP_VALUE_SEPARATOR = "\\|";
private static final String REG_EXP_MAP_SEPARATOR = ":";
- private static final UrlValidator urlValidator = new UrlValidator(new String[]{"http", "https"}, UrlValidator.ALLOW_LOCAL_URLS);
-
+ private PropertyUtils() {
+ // private constructor
+ }
public static Object parseProperty(SMPPropertyEnum prop, String value, File rootFolder) {
if (StringUtils.isBlank(value)) {
@@ -91,7 +92,7 @@ public class PropertyUtils {
parsePropertyType(type, value, confFolder);
return true;
} catch (SMPRuntimeException ex) {
- LOG.debug("Invalid property value [{}] for type [{}]. Error: ", value, type, ExceptionUtils.getRootCauseMessage(ex));
+ LOG.debug("Invalid property value [{}] for type [{}]. Error: [{}]", value, type, ExceptionUtils.getRootCauseMessage(ex));
return false;
}
}
@@ -130,7 +131,7 @@ public class PropertyUtils {
return Arrays.asList(value.split(REG_EXP_VALUE_SEPARATOR));
}
case MAP_STRING: {
- if (!value.contains(value)) {
+ if (!value.contains(":")) {
throw new SMPRuntimeException(ErrorCode.CONFIGURATION_ERROR, "Invalid map: ["
+ value + "]. Error: Map must have at least one key:value entry!");
}
@@ -202,8 +203,8 @@ public class PropertyUtils {
/**
* Method returns 'masked' value for sensitive property data
*
- * @param property
- * @param value
+ * @param property - property name
+ * @param value - property value
* @return masked value for sensitive properties. Else it returns value!
*/
public static String getMaskedData(String property, String value) {
diff --git a/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/utils/SMPCookieWriter.java b/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/utils/SMPCookieWriter.java
index b8097547bccc31a11ec6fa85bc106635a3d9f0eb..60673bedef29bc282f21d547bbf021ede52a2bfe 100644
--- a/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/utils/SMPCookieWriter.java
+++ b/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/utils/SMPCookieWriter.java
@@ -2,7 +2,7 @@
* #START_LICENSE#
* smp-server-library
* %%
- * Copyright (C) 2017 - 2023 European Commission | eDelivery | DomiSMP
+ * Copyright (C) 2017 - 2024 European Commission | eDelivery | DomiSMP
* %%
* Licensed under the EUPL, Version 1.2 or – as soon they will be approved by the European Commission - subsequent
* versions of the EUPL (the "Licence");
diff --git a/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/utils/SessionSecurityUtils.java b/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/utils/SessionSecurityUtils.java
index c6699c7adb776efb3bfd9816948f322c8433fcf7..d59c253cfea1bcb878da0e58cab8a0b3f5dc1ac1 100644
--- a/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/utils/SessionSecurityUtils.java
+++ b/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/utils/SessionSecurityUtils.java
@@ -2,7 +2,7 @@
* #START_LICENSE#
* smp-server-library
* %%
- * Copyright (C) 2017 - 2023 European Commission | eDelivery | DomiSMP
+ * Copyright (C) 2017 - 2024 European Commission | eDelivery | DomiSMP
* %%
* Licensed under the EUPL, Version 1.2 or – as soon they will be approved by the European Commission - subsequent
* versions of the EUPL (the "Licence");
diff --git a/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/utils/SmpUrlBuilder.java b/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/utils/SmpUrlBuilder.java
index 3d7ac3c1b32f876002bea175bc37697fa9ee88df..2db16c168547ad73b39b7e6fdb923618642a67d2 100644
--- a/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/utils/SmpUrlBuilder.java
+++ b/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/utils/SmpUrlBuilder.java
@@ -2,7 +2,7 @@
* #START_LICENSE#
* smp-webapp
* %%
- * Copyright (C) 2017 - 2023 European Commission | eDelivery | DomiSMP
+ * Copyright (C) 2017 - 2024 European Commission | eDelivery | DomiSMP
* %%
* Licensed under the EUPL, Version 1.2 or – as soon they will be approved by the European Commission - subsequent
* versions of the EUPL (the "Licence");
diff --git a/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/utils/StringNamedSubstitutor.java b/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/utils/StringNamedSubstitutor.java
index 5bf45e845b14b740e8ba3b9cd0243766fbd555e6..4ec54d11810fda951e2688fba32b28d2a0350834 100644
--- a/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/utils/StringNamedSubstitutor.java
+++ b/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/utils/StringNamedSubstitutor.java
@@ -2,7 +2,7 @@
* #START_LICENSE#
* smp-server-library
* %%
- * Copyright (C) 2017 - 2023 European Commission | eDelivery | DomiSMP
+ * Copyright (C) 2017 - 2024 European Commission | eDelivery | DomiSMP
* %%
* Licensed under the EUPL, Version 1.2 or – as soon they will be approved by the European Commission - subsequent
* versions of the EUPL (the "Licence");
@@ -36,6 +36,10 @@ public class StringNamedSubstitutor {
private static final String START_NAME = "${";
private static final char END_NAME = '}';
+ private StringNamedSubstitutor() {
+ // private constructor
+ }
+
/**
* Substitute named variables in the string with key value pairs from the map.
* The variables are in the form of ${name} and are case-insensitive and can contain only letters, digits, _ and .
@@ -53,7 +57,8 @@ public class StringNamedSubstitutor {
int read;
while ((read = template.read()) != -1) {
if (read == START_NAME.charAt(0) && isStartSequence(template)) {
- template.skip(START_NAME.length() - 1);
+ //skip (START_NAME.length() - 1L) which is 1L
+ template.skip(1L);
String name = readName(template, END_NAME);
if (name == null) {
builder.append(START_NAME);
diff --git a/smp-server-library/src/main/resources/mail-messages/mail-messages_en.properties b/smp-server-library/src/main/resources/mail-messages/mail-messages_en.properties
index 2bcb412ceee101b4b4a43268f2d04a6a965d815c..900b6e8bc0402571c279e4599919387ef908a204 100644
--- a/smp-server-library/src/main/resources/mail-messages/mail-messages_en.properties
+++ b/smp-server-library/src/main/resources/mail-messages/mail-messages_en.properties
@@ -1,3 +1,21 @@
+###
+# #START_LICENSE#
+# smp-server-library
+# %%
+# Copyright (C) 2017 - 2024 European Commission | eDelivery | DomiSMP
+# %%
+# Licensed under the EUPL, Version 1.2 or – as soon they will be approved by the European Commission - subsequent
+# versions of the EUPL (the "Licence");
+# You may not use this work except in compliance with the Licence.
+# You may obtain a copy of the Licence at:
+#
+# [PROJECT_HOME]\license\eupl-1.2\license.txt or https://joinup.ec.europa.eu/collection/eupl/eupl-text-eupl-12
+#
+# Unless required by applicable law or agreed to in writing, software distributed under the Licence is
+# distributed on an "AS IS" basis, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the Licence for the specific language governing permissions and limitations under the Licence.
+# #END_LICENSE#
+###
# Email translations. Each email has a header, title, content and footer. The texts are can be HTML formatted.
# The header and footer are common for all emails and should describe instance and purpose of the application.
# The title and content are specific for each email type.
diff --git a/smp-server-library/src/test/java/eu/europa/ec/edelivery/smp/auth/SMPCertificateAuthenticationTest.java b/smp-server-library/src/test/java/eu/europa/ec/edelivery/smp/auth/SMPCertificateAuthenticationTest.java
index bba6304b530c06ef925a3be18e41ba977ca51c65..3f54a716dc0a23a42fb7c5e8c26c6a5b2968e292 100644
--- a/smp-server-library/src/test/java/eu/europa/ec/edelivery/smp/auth/SMPCertificateAuthenticationTest.java
+++ b/smp-server-library/src/test/java/eu/europa/ec/edelivery/smp/auth/SMPCertificateAuthenticationTest.java
@@ -2,7 +2,7 @@
* #START_LICENSE#
* smp-server-library
* %%
- * Copyright (C) 2017 - 2023 European Commission | eDelivery | DomiSMP
+ * Copyright (C) 2017 - 2024 European Commission | eDelivery | DomiSMP
* %%
* Licensed under the EUPL, Version 1.2 or – as soon they will be approved by the European Commission - subsequent
* versions of the EUPL (the "Licence");
diff --git a/smp-server-library/src/test/java/eu/europa/ec/edelivery/smp/auth/SMPUserDetailsTest.java b/smp-server-library/src/test/java/eu/europa/ec/edelivery/smp/auth/SMPUserDetailsTest.java
index c1974d06108604d2e520d2ca4dfbb72b49129aea..bf500093eada04d8f5e8915749496fffa2838751 100644
--- a/smp-server-library/src/test/java/eu/europa/ec/edelivery/smp/auth/SMPUserDetailsTest.java
+++ b/smp-server-library/src/test/java/eu/europa/ec/edelivery/smp/auth/SMPUserDetailsTest.java
@@ -2,7 +2,7 @@
* #START_LICENSE#
* smp-server-library
* %%
- * Copyright (C) 2017 - 2023 European Commission | eDelivery | DomiSMP
+ * Copyright (C) 2017 - 2024 European Commission | eDelivery | DomiSMP
* %%
* Licensed under the EUPL, Version 1.2 or – as soon they will be approved by the European Commission - subsequent
* versions of the EUPL (the "Licence");
diff --git a/smp-server-library/src/test/java/eu/europa/ec/edelivery/smp/config/AuthenticationTestDataHolder.java b/smp-server-library/src/test/java/eu/europa/ec/edelivery/smp/config/AuthenticationTestDataHolder.java
index 39dc487c56f9a85a77a7e99d6ec0f717b3975757..5f393382e72eadc00979ef35f84b2ca723525310 100644
--- a/smp-server-library/src/test/java/eu/europa/ec/edelivery/smp/config/AuthenticationTestDataHolder.java
+++ b/smp-server-library/src/test/java/eu/europa/ec/edelivery/smp/config/AuthenticationTestDataHolder.java
@@ -2,7 +2,7 @@
* #START_LICENSE#
* smp-server-library
* %%
- * Copyright (C) 2017 - 2023 European Commission | eDelivery | DomiSMP
+ * Copyright (C) 2017 - 2024 European Commission | eDelivery | DomiSMP
* %%
* Licensed under the EUPL, Version 1.2 or – as soon they will be approved by the European Commission - subsequent
* versions of the EUPL (the "Licence");
diff --git a/smp-server-library/src/test/java/eu/europa/ec/edelivery/smp/config/ConversionTestConfig.java b/smp-server-library/src/test/java/eu/europa/ec/edelivery/smp/config/ConversionTestConfig.java
index ae1f1c65331c8bc962a79f34a4218586e34ef97d..662fa5b4d6458683292b08fdbf82e58ea9c25a46 100644
--- a/smp-server-library/src/test/java/eu/europa/ec/edelivery/smp/config/ConversionTestConfig.java
+++ b/smp-server-library/src/test/java/eu/europa/ec/edelivery/smp/config/ConversionTestConfig.java
@@ -2,7 +2,7 @@
* #START_LICENSE#
* smp-server-library
* %%
- * Copyright (C) 2017 - 2023 European Commission | eDelivery | DomiSMP
+ * Copyright (C) 2017 - 2024 European Commission | eDelivery | DomiSMP
* %%
* Licensed under the EUPL, Version 1.2 or – as soon they will be approved by the European Commission - subsequent
* versions of the EUPL (the "Licence");
diff --git a/smp-server-library/src/test/java/eu/europa/ec/edelivery/smp/config/PropertyUpdateListenerTest.java b/smp-server-library/src/test/java/eu/europa/ec/edelivery/smp/config/PropertyUpdateListenerTest.java
index 9f31cfbbd93a82bd412247fe95e488631a9a4568..26a45e41b8da453fb2e3aa51463ecadccff07733 100644
--- a/smp-server-library/src/test/java/eu/europa/ec/edelivery/smp/config/PropertyUpdateListenerTest.java
+++ b/smp-server-library/src/test/java/eu/europa/ec/edelivery/smp/config/PropertyUpdateListenerTest.java
@@ -2,7 +2,7 @@
* #START_LICENSE#
* smp-server-library
* %%
- * Copyright (C) 2017 - 2023 European Commission | eDelivery | DomiSMP
+ * Copyright (C) 2017 - 2024 European Commission | eDelivery | DomiSMP
* %%
* Licensed under the EUPL, Version 1.2 or – as soon they will be approved by the European Commission - subsequent
* versions of the EUPL (the "Licence");
diff --git a/smp-server-library/src/test/java/eu/europa/ec/edelivery/smp/config/SMPDatabaseConfigTest.java b/smp-server-library/src/test/java/eu/europa/ec/edelivery/smp/config/SMPDatabaseConfigTest.java
index e579cb44ce914ab87c9efd0a1cec4c3cf2dec240..b850f8eff7a5b6f2c0bdb99b7e35dcbf93803a52 100644
--- a/smp-server-library/src/test/java/eu/europa/ec/edelivery/smp/config/SMPDatabaseConfigTest.java
+++ b/smp-server-library/src/test/java/eu/europa/ec/edelivery/smp/config/SMPDatabaseConfigTest.java
@@ -2,7 +2,7 @@
* #START_LICENSE#
* smp-server-library
* %%
- * Copyright (C) 2017 - 2023 European Commission | eDelivery | DomiSMP
+ * Copyright (C) 2017 - 2024 European Commission | eDelivery | DomiSMP
* %%
* Licensed under the EUPL, Version 1.2 or – as soon they will be approved by the European Commission - subsequent
* versions of the EUPL (the "Licence");
diff --git a/smp-server-library/src/test/java/eu/europa/ec/edelivery/smp/config/SMPEnvironmentPropertiesTest.java b/smp-server-library/src/test/java/eu/europa/ec/edelivery/smp/config/SMPEnvironmentPropertiesTest.java
index 2fe65d4b31f90eb7c15a866b147bb795f00b2de1..65717ff9449c64882133bfab2e5564f44d003705 100644
--- a/smp-server-library/src/test/java/eu/europa/ec/edelivery/smp/config/SMPEnvironmentPropertiesTest.java
+++ b/smp-server-library/src/test/java/eu/europa/ec/edelivery/smp/config/SMPEnvironmentPropertiesTest.java
@@ -2,7 +2,7 @@
* #START_LICENSE#
* smp-server-library
* %%
- * Copyright (C) 2017 - 2023 European Commission | eDelivery | DomiSMP
+ * Copyright (C) 2017 - 2024 European Commission | eDelivery | DomiSMP
* %%
* Licensed under the EUPL, Version 1.2 or – as soon they will be approved by the European Commission - subsequent
* versions of the EUPL (the "Licence");
diff --git a/smp-server-library/src/test/java/eu/europa/ec/edelivery/smp/config/init/SMPExtensionInitializerTest.java b/smp-server-library/src/test/java/eu/europa/ec/edelivery/smp/config/init/SMPExtensionInitializerTest.java
index 85c6b7fa67472faa59c5f60e94cf08b05ee5f560..a84af31ecf3f1cf6e5c8380a571d41ca0f1bea29 100644
--- a/smp-server-library/src/test/java/eu/europa/ec/edelivery/smp/config/init/SMPExtensionInitializerTest.java
+++ b/smp-server-library/src/test/java/eu/europa/ec/edelivery/smp/config/init/SMPExtensionInitializerTest.java
@@ -2,7 +2,7 @@
* #START_LICENSE#
* smp-server-library
* %%
- * Copyright (C) 2017 - 2023 European Commission | eDelivery | DomiSMP
+ * Copyright (C) 2017 - 2024 European Commission | eDelivery | DomiSMP
* %%
* Licensed under the EUPL, Version 1.2 or – as soon they will be approved by the European Commission - subsequent
* versions of the EUPL (the "Licence");
diff --git a/smp-server-library/src/test/java/eu/europa/ec/edelivery/smp/config/init/SMPKeystoreConfBuilderTest.java b/smp-server-library/src/test/java/eu/europa/ec/edelivery/smp/config/init/SMPKeystoreConfBuilderTest.java
index 2e01f80a94bf193729efa6a89fa0085dd9b496fb..7f85f6d918c3dada3bd4ad6bf919684b0c799463 100644
--- a/smp-server-library/src/test/java/eu/europa/ec/edelivery/smp/config/init/SMPKeystoreConfBuilderTest.java
+++ b/smp-server-library/src/test/java/eu/europa/ec/edelivery/smp/config/init/SMPKeystoreConfBuilderTest.java
@@ -2,7 +2,7 @@
* #START_LICENSE#
* smp-server-library
* %%
- * Copyright (C) 2017 - 2023 European Commission | eDelivery | DomiSMP
+ * Copyright (C) 2017 - 2024 European Commission | eDelivery | DomiSMP
* %%
* Licensed under the EUPL, Version 1.2 or – as soon they will be approved by the European Commission - subsequent
* versions of the EUPL (the "Licence");
diff --git a/smp-server-library/src/test/java/eu/europa/ec/edelivery/smp/conversion/DBUserToUserROConverterTest.java b/smp-server-library/src/test/java/eu/europa/ec/edelivery/smp/conversion/DBUserToUserROConverterTest.java
index 9eb4a630c2eefc5353b7bb3cbb911211cd350234..4706abd9b1a8f31384d1f8fff04b7cc95e3889dd 100644
--- a/smp-server-library/src/test/java/eu/europa/ec/edelivery/smp/conversion/DBUserToUserROConverterTest.java
+++ b/smp-server-library/src/test/java/eu/europa/ec/edelivery/smp/conversion/DBUserToUserROConverterTest.java
@@ -2,7 +2,7 @@
* #START_LICENSE#
* smp-server-library
* %%
- * Copyright (C) 2017 - 2023 European Commission | eDelivery | DomiSMP
+ * Copyright (C) 2017 - 2024 European Commission | eDelivery | DomiSMP
* %%
* Licensed under the EUPL, Version 1.2 or – as soon they will be approved by the European Commission - subsequent
* versions of the EUPL (the "Licence");
diff --git a/smp-server-library/src/test/java/eu/europa/ec/edelivery/smp/conversion/IdentifierServiceTests.java b/smp-server-library/src/test/java/eu/europa/ec/edelivery/smp/conversion/IdentifierServiceTests.java
index fb97b54d2e5793ced905be7590eca47d76a0b66b..ff523d2666fd9942cd896f0ffc8f3e3eea45d270 100644
--- a/smp-server-library/src/test/java/eu/europa/ec/edelivery/smp/conversion/IdentifierServiceTests.java
+++ b/smp-server-library/src/test/java/eu/europa/ec/edelivery/smp/conversion/IdentifierServiceTests.java
@@ -2,7 +2,7 @@
* #START_LICENSE#
* smp-webapp
* %%
- * Copyright (C) 2017 - 2023 European Commission | eDelivery | DomiSMP
+ * Copyright (C) 2017 - 2024 European Commission | eDelivery | DomiSMP
* %%
* Licensed under the EUPL, Version 1.2 or – as soon they will be approved by the European Commission - subsequent
* versions of the EUPL (the "Licence");
diff --git a/smp-server-library/src/test/java/eu/europa/ec/edelivery/smp/conversion/SmlIdentifierConverterTest.java b/smp-server-library/src/test/java/eu/europa/ec/edelivery/smp/conversion/SmlIdentifierConverterTest.java
index b4b7811d5a4472abc510ed871206d1c3c956a35a..6a509075b889e4430816187c5a5a51a5f7766146 100644
--- a/smp-server-library/src/test/java/eu/europa/ec/edelivery/smp/conversion/SmlIdentifierConverterTest.java
+++ b/smp-server-library/src/test/java/eu/europa/ec/edelivery/smp/conversion/SmlIdentifierConverterTest.java
@@ -2,7 +2,7 @@
* #START_LICENSE#
* smp-webapp
* %%
- * Copyright (C) 2017 - 2023 European Commission | eDelivery | DomiSMP
+ * Copyright (C) 2017 - 2024 European Commission | eDelivery | DomiSMP
* %%
* Licensed under the EUPL, Version 1.2 or – as soon they will be approved by the European Commission - subsequent
* versions of the EUPL (the "Licence");
diff --git a/smp-server-library/src/test/java/eu/europa/ec/edelivery/smp/conversion/UserROToDBUserConverterTest.java b/smp-server-library/src/test/java/eu/europa/ec/edelivery/smp/conversion/UserROToDBUserConverterTest.java
index a5c6990b4ac0e3ce754dc9af114eae23ae5eb4dd..81dadc8a3fd4853a0feb1225332e56781d0252f8 100644
--- a/smp-server-library/src/test/java/eu/europa/ec/edelivery/smp/conversion/UserROToDBUserConverterTest.java
+++ b/smp-server-library/src/test/java/eu/europa/ec/edelivery/smp/conversion/UserROToDBUserConverterTest.java
@@ -2,7 +2,7 @@
* #START_LICENSE#
* smp-server-library
* %%
- * Copyright (C) 2017 - 2023 European Commission | eDelivery | DomiSMP
+ * Copyright (C) 2017 - 2024 European Commission | eDelivery | DomiSMP
* %%
* Licensed under the EUPL, Version 1.2 or – as soon they will be approved by the European Commission - subsequent
* versions of the EUPL (the "Licence");
diff --git a/smp-server-library/src/test/java/eu/europa/ec/edelivery/smp/conversion/X509CertificateToCertificateROConverterTest.java b/smp-server-library/src/test/java/eu/europa/ec/edelivery/smp/conversion/X509CertificateToCertificateROConverterTest.java
index 1eb7bd8860f3739097eb772668b55b15115f9bd1..98fdf3255ded846aa0f754a68f70037115fde975 100644
--- a/smp-server-library/src/test/java/eu/europa/ec/edelivery/smp/conversion/X509CertificateToCertificateROConverterTest.java
+++ b/smp-server-library/src/test/java/eu/europa/ec/edelivery/smp/conversion/X509CertificateToCertificateROConverterTest.java
@@ -2,7 +2,7 @@
* #START_LICENSE#
* smp-server-library
* %%
- * Copyright (C) 2017 - 2023 European Commission | eDelivery | DomiSMP
+ * Copyright (C) 2017 - 2024 European Commission | eDelivery | DomiSMP
* %%
* Licensed under the EUPL, Version 1.2 or – as soon they will be approved by the European Commission - subsequent
* versions of the EUPL (the "Licence");
diff --git a/smp-server-library/src/test/java/eu/europa/ec/edelivery/smp/cron/SMPDynamicCronTriggerTest.java b/smp-server-library/src/test/java/eu/europa/ec/edelivery/smp/cron/SMPDynamicCronTriggerTest.java
index 1efaab86ec1e4c0dfb66c0a994691ca6eee5b696..18077a33a6f2ba356b379afecf0cfd3af4d65c8b 100644
--- a/smp-server-library/src/test/java/eu/europa/ec/edelivery/smp/cron/SMPDynamicCronTriggerTest.java
+++ b/smp-server-library/src/test/java/eu/europa/ec/edelivery/smp/cron/SMPDynamicCronTriggerTest.java
@@ -2,7 +2,7 @@
* #START_LICENSE#
* smp-server-library
* %%
- * Copyright (C) 2017 - 2023 European Commission | eDelivery | DomiSMP
+ * Copyright (C) 2017 - 2024 European Commission | eDelivery | DomiSMP
* %%
* Licensed under the EUPL, Version 1.2 or – as soon they will be approved by the European Commission - subsequent
* versions of the EUPL (the "Licence");
diff --git a/smp-server-library/src/test/java/eu/europa/ec/edelivery/smp/data/dao/AbstractBaseDao.java b/smp-server-library/src/test/java/eu/europa/ec/edelivery/smp/data/dao/AbstractBaseDao.java
index 19bd89a4aa54bc3fa547110789c93e1062ab0890..cb41d0554ec7f56d71ada3b3d5d8cc456e99f462 100644
--- a/smp-server-library/src/test/java/eu/europa/ec/edelivery/smp/data/dao/AbstractBaseDao.java
+++ b/smp-server-library/src/test/java/eu/europa/ec/edelivery/smp/data/dao/AbstractBaseDao.java
@@ -2,7 +2,7 @@
* #START_LICENSE#
* smp-server-library
* %%
- * Copyright (C) 2017 - 2023 European Commission | eDelivery | DomiSMP
+ * Copyright (C) 2017 - 2024 European Commission | eDelivery | DomiSMP
* %%
* Licensed under the EUPL, Version 1.2 or – as soon they will be approved by the European Commission - subsequent
* versions of the EUPL (the "Licence");
diff --git a/smp-server-library/src/test/java/eu/europa/ec/edelivery/smp/data/dao/AbstractJunit5BaseDao.java b/smp-server-library/src/test/java/eu/europa/ec/edelivery/smp/data/dao/AbstractJunit5BaseDao.java
index e2f23dad04264a3d4c40dbe3b29fbdeb8c4ebd86..661b624ece8da599ecab472f0807670df634056b 100644
--- a/smp-server-library/src/test/java/eu/europa/ec/edelivery/smp/data/dao/AbstractJunit5BaseDao.java
+++ b/smp-server-library/src/test/java/eu/europa/ec/edelivery/smp/data/dao/AbstractJunit5BaseDao.java
@@ -2,7 +2,7 @@
* #START_LICENSE#
* smp-server-library
* %%
- * Copyright (C) 2017 - 2023 European Commission | eDelivery | DomiSMP
+ * Copyright (C) 2017 - 2024 European Commission | eDelivery | DomiSMP
* %%
* Licensed under the EUPL, Version 1.2 or – as soon they will be approved by the European Commission - subsequent
* versions of the EUPL (the "Licence");
diff --git a/smp-server-library/src/test/java/eu/europa/ec/edelivery/smp/data/dao/AbstractResourceDaoTest.java b/smp-server-library/src/test/java/eu/europa/ec/edelivery/smp/data/dao/AbstractResourceDaoTest.java
index 8d4cf17031c6b69ed9c6e2f993401814891a3044..db7ce65835cd012ddfa7931774d9e32c0ecdea3b 100644
--- a/smp-server-library/src/test/java/eu/europa/ec/edelivery/smp/data/dao/AbstractResourceDaoTest.java
+++ b/smp-server-library/src/test/java/eu/europa/ec/edelivery/smp/data/dao/AbstractResourceDaoTest.java
@@ -2,7 +2,7 @@
* #START_LICENSE#
* smp-server-library
* %%
- * Copyright (C) 2017 - 2023 European Commission | eDelivery | DomiSMP
+ * Copyright (C) 2017 - 2024 European Commission | eDelivery | DomiSMP
* %%
* Licensed under the EUPL, Version 1.2 or – as soon they will be approved by the European Commission - subsequent
* versions of the EUPL (the "Licence");
diff --git a/smp-server-library/src/test/java/eu/europa/ec/edelivery/smp/data/dao/AlertDaoIntegrationTest.java b/smp-server-library/src/test/java/eu/europa/ec/edelivery/smp/data/dao/AlertDaoIntegrationTest.java
index 79af9c9289f50869975e1e401301d134d4880d9a..1a3fcff71fdbce3a93c0b39bde7ea64c2a849597 100644
--- a/smp-server-library/src/test/java/eu/europa/ec/edelivery/smp/data/dao/AlertDaoIntegrationTest.java
+++ b/smp-server-library/src/test/java/eu/europa/ec/edelivery/smp/data/dao/AlertDaoIntegrationTest.java
@@ -2,7 +2,7 @@
* #START_LICENSE#
* smp-server-library
* %%
- * Copyright (C) 2017 - 2023 European Commission | eDelivery | DomiSMP
+ * Copyright (C) 2017 - 2024 European Commission | eDelivery | DomiSMP
* %%
* Licensed under the EUPL, Version 1.2 or – as soon they will be approved by the European Commission - subsequent
* versions of the EUPL (the "Licence");
diff --git a/smp-server-library/src/test/java/eu/europa/ec/edelivery/smp/data/dao/AuditIntegrationTest.java b/smp-server-library/src/test/java/eu/europa/ec/edelivery/smp/data/dao/AuditIntegrationTest.java
index 8490c31b6c24de34887d92555dc33e3918306fe4..d655cf24213f1e0706aef4ee4f5e72f758d4022a 100644
--- a/smp-server-library/src/test/java/eu/europa/ec/edelivery/smp/data/dao/AuditIntegrationTest.java
+++ b/smp-server-library/src/test/java/eu/europa/ec/edelivery/smp/data/dao/AuditIntegrationTest.java
@@ -2,7 +2,7 @@
* #START_LICENSE#
* smp-webapp
* %%
- * Copyright (C) 2017 - 2023 European Commission | eDelivery | DomiSMP
+ * Copyright (C) 2017 - 2024 European Commission | eDelivery | DomiSMP
* %%
* Licensed under the EUPL, Version 1.2 or – as soon they will be approved by the European Commission - subsequent
* versions of the EUPL (the "Licence");
diff --git a/smp-server-library/src/test/java/eu/europa/ec/edelivery/smp/data/dao/BaseDaoTest.java b/smp-server-library/src/test/java/eu/europa/ec/edelivery/smp/data/dao/BaseDaoTest.java
index e55213b6fa35b2b1c76ba571264463447930cec0..caa978bd030be489e554a4698362f9a1c9e3689e 100644
--- a/smp-server-library/src/test/java/eu/europa/ec/edelivery/smp/data/dao/BaseDaoTest.java
+++ b/smp-server-library/src/test/java/eu/europa/ec/edelivery/smp/data/dao/BaseDaoTest.java
@@ -2,7 +2,7 @@
* #START_LICENSE#
* smp-server-library
* %%
- * Copyright (C) 2017 - 2023 European Commission | eDelivery | DomiSMP
+ * Copyright (C) 2017 - 2024 European Commission | eDelivery | DomiSMP
* %%
* Licensed under the EUPL, Version 1.2 or – as soon they will be approved by the European Commission - subsequent
* versions of the EUPL (the "Licence");
diff --git a/smp-server-library/src/test/java/eu/europa/ec/edelivery/smp/data/dao/ConfigurationDAOImplTest.java b/smp-server-library/src/test/java/eu/europa/ec/edelivery/smp/data/dao/ConfigurationDAOImplTest.java
index 3a3fd186035191fc571c45ebe6cc09019e79c85a..9fd0874d0301a7b1005dc39e46b48e85b1a1daa9 100644
--- a/smp-server-library/src/test/java/eu/europa/ec/edelivery/smp/data/dao/ConfigurationDAOImplTest.java
+++ b/smp-server-library/src/test/java/eu/europa/ec/edelivery/smp/data/dao/ConfigurationDAOImplTest.java
@@ -2,7 +2,7 @@
* #START_LICENSE#
* smp-server-library
* %%
- * Copyright (C) 2017 - 2023 European Commission | eDelivery | DomiSMP
+ * Copyright (C) 2017 - 2024 European Commission | eDelivery | DomiSMP
* %%
* Licensed under the EUPL, Version 1.2 or – as soon they will be approved by the European Commission - subsequent
* versions of the EUPL (the "Licence");
@@ -16,23 +16,6 @@
* See the Licence for the specific language governing permissions and limitations under the Licence.
* #END_LICENSE#
*/
-/**
- * Copyright 2017 - European Commission | CEF eDelivery
- * <p>
- * Licensed under the EUPL, Version 1.2 (the "License");
- * You may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * <p>
- * \BDMSL\bdmsl-parent-pom\LICENSE-EUPL-v1.2.pdf or https://joinup.ec.europa.eu/sites/default/files/custom-page/attachment/eupl_v1.2_en.pdf
- * <p>
- * 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.
- * <p>
- * * @author Flávio W. R. Santos - CEF-EDELIVERY-SUPPORT@ec.europa.eu
- **/
package eu.europa.ec.edelivery.smp.data.dao;
@@ -318,7 +301,7 @@ public class ConfigurationDAOImplTest extends AbstractBaseDao {
}
@Test
- void encryptDefaultError() throws IOException {
+ void encryptDefaultError() {
// given
File f = new File("no.key");
String password = "TEST11002password1@!." + System.currentTimeMillis();
@@ -528,7 +511,7 @@ public class ConfigurationDAOImplTest extends AbstractBaseDao {
configurationDao.update(dbProp);
}
- public static File generateRandomPrivateKey() throws IOException {
+ public static File generateRandomPrivateKey() {
File resource = Paths.get("target", UUID.randomUUID() + ".key").toFile();
SecurityUtils.generatePrivateSymmetricKey(resource, true);
return resource;
diff --git a/smp-server-library/src/test/java/eu/europa/ec/edelivery/smp/data/dao/CredentialDaoAlertsTest.java b/smp-server-library/src/test/java/eu/europa/ec/edelivery/smp/data/dao/CredentialDaoAlertsTest.java
index 86cf7a4c3517b04fc914d312f28ca6e454da4848..8b00efb768ac284a3856eeae1bbfcc76f074976b 100644
--- a/smp-server-library/src/test/java/eu/europa/ec/edelivery/smp/data/dao/CredentialDaoAlertsTest.java
+++ b/smp-server-library/src/test/java/eu/europa/ec/edelivery/smp/data/dao/CredentialDaoAlertsTest.java
@@ -2,7 +2,7 @@
* #START_LICENSE#
* smp-server-library
* %%
- * Copyright (C) 2017 - 2023 European Commission | eDelivery | DomiSMP
+ * Copyright (C) 2017 - 2024 European Commission | eDelivery | DomiSMP
* %%
* Licensed under the EUPL, Version 1.2 or – as soon they will be approved by the European Commission - subsequent
* versions of the EUPL (the "Licence");
diff --git a/smp-server-library/src/test/java/eu/europa/ec/edelivery/smp/data/dao/CredentialDaoIntegrationTest.java b/smp-server-library/src/test/java/eu/europa/ec/edelivery/smp/data/dao/CredentialDaoIntegrationTest.java
index fce721f96f5233cc31328c251a84f45fb63d0f26..406990cf6b5abd2246e83466c3a34e3d87218c70 100644
--- a/smp-server-library/src/test/java/eu/europa/ec/edelivery/smp/data/dao/CredentialDaoIntegrationTest.java
+++ b/smp-server-library/src/test/java/eu/europa/ec/edelivery/smp/data/dao/CredentialDaoIntegrationTest.java
@@ -2,7 +2,7 @@
* #START_LICENSE#
* smp-server-library
* %%
- * Copyright (C) 2017 - 2023 European Commission | eDelivery | DomiSMP
+ * Copyright (C) 2017 - 2024 European Commission | eDelivery | DomiSMP
* %%
* Licensed under the EUPL, Version 1.2 or – as soon they will be approved by the European Commission - subsequent
* versions of the EUPL (the "Licence");
diff --git a/smp-server-library/src/test/java/eu/europa/ec/edelivery/smp/data/dao/DocumentDaoTest.java b/smp-server-library/src/test/java/eu/europa/ec/edelivery/smp/data/dao/DocumentDaoTest.java
index 69d9c5d060f00ea26586475a32435402251d82a9..d821adb94c9e8cc510907e920cc6ba909b41bc04 100644
--- a/smp-server-library/src/test/java/eu/europa/ec/edelivery/smp/data/dao/DocumentDaoTest.java
+++ b/smp-server-library/src/test/java/eu/europa/ec/edelivery/smp/data/dao/DocumentDaoTest.java
@@ -2,7 +2,7 @@
* #START_LICENSE#
* smp-server-library
* %%
- * Copyright (C) 2017 - 2023 European Commission | eDelivery | DomiSMP
+ * Copyright (C) 2017 - 2024 European Commission | eDelivery | DomiSMP
* %%
* Licensed under the EUPL, Version 1.2 or – as soon they will be approved by the European Commission - subsequent
* versions of the EUPL (the "Licence");
diff --git a/smp-server-library/src/test/java/eu/europa/ec/edelivery/smp/data/dao/DomainDaoIntegrationTest.java b/smp-server-library/src/test/java/eu/europa/ec/edelivery/smp/data/dao/DomainDaoIntegrationTest.java
index c4af53a9a2eedb054f361dc3fc55b6819b04d659..2f57b59d10d3c8e5d4ff406858f2cb3968088251 100644
--- a/smp-server-library/src/test/java/eu/europa/ec/edelivery/smp/data/dao/DomainDaoIntegrationTest.java
+++ b/smp-server-library/src/test/java/eu/europa/ec/edelivery/smp/data/dao/DomainDaoIntegrationTest.java
@@ -2,7 +2,7 @@
* #START_LICENSE#
* smp-server-library
* %%
- * Copyright (C) 2017 - 2023 European Commission | eDelivery | DomiSMP
+ * Copyright (C) 2017 - 2024 European Commission | eDelivery | DomiSMP
* %%
* Licensed under the EUPL, Version 1.2 or – as soon they will be approved by the European Commission - subsequent
* versions of the EUPL (the "Licence");
diff --git a/smp-server-library/src/test/java/eu/europa/ec/edelivery/smp/data/dao/DomainDaoTest.java b/smp-server-library/src/test/java/eu/europa/ec/edelivery/smp/data/dao/DomainDaoTest.java
index bf14778e2e573b583ae7ae4b395452d6d0ea4d34..838781ccc9b653d125283f97d3c32a011f6e82b1 100644
--- a/smp-server-library/src/test/java/eu/europa/ec/edelivery/smp/data/dao/DomainDaoTest.java
+++ b/smp-server-library/src/test/java/eu/europa/ec/edelivery/smp/data/dao/DomainDaoTest.java
@@ -2,7 +2,7 @@
* #START_LICENSE#
* smp-server-library
* %%
- * Copyright (C) 2017 - 2023 European Commission | eDelivery | DomiSMP
+ * Copyright (C) 2017 - 2024 European Commission | eDelivery | DomiSMP
* %%
* Licensed under the EUPL, Version 1.2 or – as soon they will be approved by the European Commission - subsequent
* versions of the EUPL (the "Licence");
diff --git a/smp-server-library/src/test/java/eu/europa/ec/edelivery/smp/data/dao/DomainMemberDaoTest.java b/smp-server-library/src/test/java/eu/europa/ec/edelivery/smp/data/dao/DomainMemberDaoTest.java
index 289aaffaef75cd2fafbc94e13688b4258bed8e30..70953ea70995c9178a23f3d0816710610ee07b35 100644
--- a/smp-server-library/src/test/java/eu/europa/ec/edelivery/smp/data/dao/DomainMemberDaoTest.java
+++ b/smp-server-library/src/test/java/eu/europa/ec/edelivery/smp/data/dao/DomainMemberDaoTest.java
@@ -2,7 +2,7 @@
* #START_LICENSE#
* smp-server-library
* %%
- * Copyright (C) 2017 - 2023 European Commission | eDelivery | DomiSMP
+ * Copyright (C) 2017 - 2024 European Commission | eDelivery | DomiSMP
* %%
* Licensed under the EUPL, Version 1.2 or – as soon they will be approved by the European Commission - subsequent
* versions of the EUPL (the "Licence");
diff --git a/smp-server-library/src/test/java/eu/europa/ec/edelivery/smp/data/dao/DomainResourceDefDaoTest.java b/smp-server-library/src/test/java/eu/europa/ec/edelivery/smp/data/dao/DomainResourceDefDaoTest.java
index 7898672b1eb7df4f9e384794168d2e7884ae4d50..5c2785b85fd0e368c9d09fa3926b747c76a5b572 100644
--- a/smp-server-library/src/test/java/eu/europa/ec/edelivery/smp/data/dao/DomainResourceDefDaoTest.java
+++ b/smp-server-library/src/test/java/eu/europa/ec/edelivery/smp/data/dao/DomainResourceDefDaoTest.java
@@ -2,7 +2,7 @@
* #START_LICENSE#
* smp-server-library
* %%
- * Copyright (C) 2017 - 2023 European Commission | eDelivery | DomiSMP
+ * Copyright (C) 2017 - 2024 European Commission | eDelivery | DomiSMP
* %%
* Licensed under the EUPL, Version 1.2 or – as soon they will be approved by the European Commission - subsequent
* versions of the EUPL (the "Licence");
diff --git a/smp-server-library/src/test/java/eu/europa/ec/edelivery/smp/data/dao/ExtensionDaoTest.java b/smp-server-library/src/test/java/eu/europa/ec/edelivery/smp/data/dao/ExtensionDaoTest.java
index 0fdfbae75e60b59002194cad1bca20e7766cac6d..434bf0a08ef4eeedd09401141570aff52eb34b9c 100644
--- a/smp-server-library/src/test/java/eu/europa/ec/edelivery/smp/data/dao/ExtensionDaoTest.java
+++ b/smp-server-library/src/test/java/eu/europa/ec/edelivery/smp/data/dao/ExtensionDaoTest.java
@@ -2,7 +2,7 @@
* #START_LICENSE#
* smp-server-library
* %%
- * Copyright (C) 2017 - 2023 European Commission | eDelivery | DomiSMP
+ * Copyright (C) 2017 - 2024 European Commission | eDelivery | DomiSMP
* %%
* Licensed under the EUPL, Version 1.2 or – as soon they will be approved by the European Commission - subsequent
* versions of the EUPL (the "Licence");
diff --git a/smp-server-library/src/test/java/eu/europa/ec/edelivery/smp/data/dao/GroupDaoTest.java b/smp-server-library/src/test/java/eu/europa/ec/edelivery/smp/data/dao/GroupDaoTest.java
index 101124bb8a91144f7db3b46a5bcc5d17f08b5cbd..cabf557452c861716b2d4d5060e92d2c5d5c9559 100644
--- a/smp-server-library/src/test/java/eu/europa/ec/edelivery/smp/data/dao/GroupDaoTest.java
+++ b/smp-server-library/src/test/java/eu/europa/ec/edelivery/smp/data/dao/GroupDaoTest.java
@@ -2,7 +2,7 @@
* #START_LICENSE#
* smp-server-library
* %%
- * Copyright (C) 2017 - 2023 European Commission | eDelivery | DomiSMP
+ * Copyright (C) 2017 - 2024 European Commission | eDelivery | DomiSMP
* %%
* Licensed under the EUPL, Version 1.2 or – as soon they will be approved by the European Commission - subsequent
* versions of the EUPL (the "Licence");
diff --git a/smp-server-library/src/test/java/eu/europa/ec/edelivery/smp/data/dao/GroupMemberDaoTest.java b/smp-server-library/src/test/java/eu/europa/ec/edelivery/smp/data/dao/GroupMemberDaoTest.java
index 3bc81b2fd426dc503897ac76cadde8700cbefeaa..819a79c8cbbe1b454282cc6bd9c62429bf840979 100644
--- a/smp-server-library/src/test/java/eu/europa/ec/edelivery/smp/data/dao/GroupMemberDaoTest.java
+++ b/smp-server-library/src/test/java/eu/europa/ec/edelivery/smp/data/dao/GroupMemberDaoTest.java
@@ -2,7 +2,7 @@
* #START_LICENSE#
* smp-server-library
* %%
- * Copyright (C) 2017 - 2023 European Commission | eDelivery | DomiSMP
+ * Copyright (C) 2017 - 2024 European Commission | eDelivery | DomiSMP
* %%
* Licensed under the EUPL, Version 1.2 or – as soon they will be approved by the European Commission - subsequent
* versions of the EUPL (the "Licence");
diff --git a/smp-server-library/src/test/java/eu/europa/ec/edelivery/smp/data/dao/ResourceDaoMembershipIntegrationTest.java b/smp-server-library/src/test/java/eu/europa/ec/edelivery/smp/data/dao/ResourceDaoMembershipIntegrationTest.java
index 05a100bfce028b7f9516f075746ba20781cf26b1..e2d485c71626740e512007552f6631e0864dc2b9 100644
--- a/smp-server-library/src/test/java/eu/europa/ec/edelivery/smp/data/dao/ResourceDaoMembershipIntegrationTest.java
+++ b/smp-server-library/src/test/java/eu/europa/ec/edelivery/smp/data/dao/ResourceDaoMembershipIntegrationTest.java
@@ -2,7 +2,7 @@
* #START_LICENSE#
* smp-server-library
* %%
- * Copyright (C) 2017 - 2023 European Commission | eDelivery | DomiSMP
+ * Copyright (C) 2017 - 2024 European Commission | eDelivery | DomiSMP
* %%
* Licensed under the EUPL, Version 1.2 or – as soon they will be approved by the European Commission - subsequent
* versions of the EUPL (the "Licence");
diff --git a/smp-server-library/src/test/java/eu/europa/ec/edelivery/smp/data/dao/ResourceDaoSearchTest.java b/smp-server-library/src/test/java/eu/europa/ec/edelivery/smp/data/dao/ResourceDaoSearchTest.java
index b9c61a51f35f483aac9a4b812e25fde0661bc967..9be8653f624167a0a0bba10742198ceeca32a48f 100644
--- a/smp-server-library/src/test/java/eu/europa/ec/edelivery/smp/data/dao/ResourceDaoSearchTest.java
+++ b/smp-server-library/src/test/java/eu/europa/ec/edelivery/smp/data/dao/ResourceDaoSearchTest.java
@@ -2,7 +2,7 @@
* #START_LICENSE#
* smp-server-library
* %%
- * Copyright (C) 2017 - 2023 European Commission | eDelivery | DomiSMP
+ * Copyright (C) 2017 - 2024 European Commission | eDelivery | DomiSMP
* %%
* Licensed under the EUPL, Version 1.2 or – as soon they will be approved by the European Commission - subsequent
* versions of the EUPL (the "Licence");
diff --git a/smp-server-library/src/test/java/eu/europa/ec/edelivery/smp/data/dao/ResourceDaoTest.java b/smp-server-library/src/test/java/eu/europa/ec/edelivery/smp/data/dao/ResourceDaoTest.java
index 292c0b88bb1a4f53991bdb9c584cfadb00cf742b..d6bd0c869ebb37061d3a5c6306fe05fd792c75bc 100644
--- a/smp-server-library/src/test/java/eu/europa/ec/edelivery/smp/data/dao/ResourceDaoTest.java
+++ b/smp-server-library/src/test/java/eu/europa/ec/edelivery/smp/data/dao/ResourceDaoTest.java
@@ -2,7 +2,7 @@
* #START_LICENSE#
* smp-server-library
* %%
- * Copyright (C) 2017 - 2023 European Commission | eDelivery | DomiSMP
+ * Copyright (C) 2017 - 2024 European Commission | eDelivery | DomiSMP
* %%
* Licensed under the EUPL, Version 1.2 or – as soon they will be approved by the European Commission - subsequent
* versions of the EUPL (the "Licence");
diff --git a/smp-server-library/src/test/java/eu/europa/ec/edelivery/smp/data/dao/ResourceDefDaoTest.java b/smp-server-library/src/test/java/eu/europa/ec/edelivery/smp/data/dao/ResourceDefDaoTest.java
index 219e89b92273b04c347c64a2c6c7aa4fba4ecdfb..d8d7c445fc01476b49ae18baa3d66808ac1c9f4f 100644
--- a/smp-server-library/src/test/java/eu/europa/ec/edelivery/smp/data/dao/ResourceDefDaoTest.java
+++ b/smp-server-library/src/test/java/eu/europa/ec/edelivery/smp/data/dao/ResourceDefDaoTest.java
@@ -2,7 +2,7 @@
* #START_LICENSE#
* smp-server-library
* %%
- * Copyright (C) 2017 - 2023 European Commission | eDelivery | DomiSMP
+ * Copyright (C) 2017 - 2024 European Commission | eDelivery | DomiSMP
* %%
* Licensed under the EUPL, Version 1.2 or – as soon they will be approved by the European Commission - subsequent
* versions of the EUPL (the "Licence");
diff --git a/smp-server-library/src/test/java/eu/europa/ec/edelivery/smp/data/dao/ResourceMemberDaoTest.java b/smp-server-library/src/test/java/eu/europa/ec/edelivery/smp/data/dao/ResourceMemberDaoTest.java
index a3bf0647b3d1c387040a96862e663b4e641abf29..1cae5abc4e442ae2c273a0c5c55fda2ce9c7403b 100644
--- a/smp-server-library/src/test/java/eu/europa/ec/edelivery/smp/data/dao/ResourceMemberDaoTest.java
+++ b/smp-server-library/src/test/java/eu/europa/ec/edelivery/smp/data/dao/ResourceMemberDaoTest.java
@@ -2,7 +2,7 @@
* #START_LICENSE#
* smp-server-library
* %%
- * Copyright (C) 2017 - 2023 European Commission | eDelivery | DomiSMP
+ * Copyright (C) 2017 - 2024 European Commission | eDelivery | DomiSMP
* %%
* Licensed under the EUPL, Version 1.2 or – as soon they will be approved by the European Commission - subsequent
* versions of the EUPL (the "Licence");
diff --git a/smp-server-library/src/test/java/eu/europa/ec/edelivery/smp/data/dao/SubresourceDaoTest.java b/smp-server-library/src/test/java/eu/europa/ec/edelivery/smp/data/dao/SubresourceDaoTest.java
index bd0339fcda64e63e8b25c29bcb38dd80539b6d78..e03f84b65926f3bcab481fad1027567dcf59dc4b 100644
--- a/smp-server-library/src/test/java/eu/europa/ec/edelivery/smp/data/dao/SubresourceDaoTest.java
+++ b/smp-server-library/src/test/java/eu/europa/ec/edelivery/smp/data/dao/SubresourceDaoTest.java
@@ -2,7 +2,7 @@
* #START_LICENSE#
* smp-server-library
* %%
- * Copyright (C) 2017 - 2023 European Commission | eDelivery | DomiSMP
+ * Copyright (C) 2017 - 2024 European Commission | eDelivery | DomiSMP
* %%
* Licensed under the EUPL, Version 1.2 or – as soon they will be approved by the European Commission - subsequent
* versions of the EUPL (the "Licence");
diff --git a/smp-server-library/src/test/java/eu/europa/ec/edelivery/smp/data/dao/TestUtilsDao.java b/smp-server-library/src/test/java/eu/europa/ec/edelivery/smp/data/dao/TestUtilsDao.java
index d03e2d626e239680307cc1120f320426eddb2f4b..33c9ebbffd509c2ef306f65799a84e874a4ad484 100644
--- a/smp-server-library/src/test/java/eu/europa/ec/edelivery/smp/data/dao/TestUtilsDao.java
+++ b/smp-server-library/src/test/java/eu/europa/ec/edelivery/smp/data/dao/TestUtilsDao.java
@@ -2,7 +2,7 @@
* #START_LICENSE#
* smp-server-library
* %%
- * Copyright (C) 2017 - 2023 European Commission | eDelivery | DomiSMP
+ * Copyright (C) 2017 - 2024 European Commission | eDelivery | DomiSMP
* %%
* Licensed under the EUPL, Version 1.2 or – as soon they will be approved by the European Commission - subsequent
* versions of the EUPL (the "Licence");
diff --git a/smp-server-library/src/test/java/eu/europa/ec/edelivery/smp/data/dao/UserDaoIntegrationTest.java b/smp-server-library/src/test/java/eu/europa/ec/edelivery/smp/data/dao/UserDaoIntegrationTest.java
index 988ea96bb5a417906d3445c749bc8916a88858a2..71c60e1f742b5a8d2e1abe8ea026ee6f8d904234 100644
--- a/smp-server-library/src/test/java/eu/europa/ec/edelivery/smp/data/dao/UserDaoIntegrationTest.java
+++ b/smp-server-library/src/test/java/eu/europa/ec/edelivery/smp/data/dao/UserDaoIntegrationTest.java
@@ -2,7 +2,7 @@
* #START_LICENSE#
* smp-server-library
* %%
- * Copyright (C) 2017 - 2023 European Commission | eDelivery | DomiSMP
+ * Copyright (C) 2017 - 2024 European Commission | eDelivery | DomiSMP
* %%
* Licensed under the EUPL, Version 1.2 or – as soon they will be approved by the European Commission - subsequent
* versions of the EUPL (the "Licence");
diff --git a/smp-server-library/src/test/java/eu/europa/ec/edelivery/smp/data/dao/utils/SMPMySQL5InnoDBDialectTest.java b/smp-server-library/src/test/java/eu/europa/ec/edelivery/smp/data/dao/utils/SMPMySQL5InnoDBDialectTest.java
index 69e8e2fede9ae831a0feb926c159b9c23696a3eb..2c46d37c00af04952016deadb4753ba87095b636 100644
--- a/smp-server-library/src/test/java/eu/europa/ec/edelivery/smp/data/dao/utils/SMPMySQL5InnoDBDialectTest.java
+++ b/smp-server-library/src/test/java/eu/europa/ec/edelivery/smp/data/dao/utils/SMPMySQL5InnoDBDialectTest.java
@@ -2,7 +2,7 @@
* #START_LICENSE#
* smp-server-library
* %%
- * Copyright (C) 2017 - 2023 European Commission | eDelivery | DomiSMP
+ * Copyright (C) 2017 - 2024 European Commission | eDelivery | DomiSMP
* %%
* Licensed under the EUPL, Version 1.2 or – as soon they will be approved by the European Commission - subsequent
* versions of the EUPL (the "Licence");
diff --git a/smp-server-library/src/test/java/eu/europa/ec/edelivery/smp/data/dao/utils/SMPSchemaGeneratorTest.java b/smp-server-library/src/test/java/eu/europa/ec/edelivery/smp/data/dao/utils/SMPSchemaGeneratorTest.java
index bf72ee552fd3dfdb29e76c846a3352d6e6c228ed..e110e957c2c6f774b66629eede7359a633a7e585 100644
--- a/smp-server-library/src/test/java/eu/europa/ec/edelivery/smp/data/dao/utils/SMPSchemaGeneratorTest.java
+++ b/smp-server-library/src/test/java/eu/europa/ec/edelivery/smp/data/dao/utils/SMPSchemaGeneratorTest.java
@@ -2,7 +2,7 @@
* #START_LICENSE#
* smp-server-library
* %%
- * Copyright (C) 2017 - 2023 European Commission | eDelivery | DomiSMP
+ * Copyright (C) 2017 - 2024 European Commission | eDelivery | DomiSMP
* %%
* Licensed under the EUPL, Version 1.2 or – as soon they will be approved by the European Commission - subsequent
* versions of the EUPL (the "Licence");
diff --git a/smp-server-library/src/test/java/eu/europa/ec/edelivery/smp/data/model/doc/DBResourceFilterTest.java b/smp-server-library/src/test/java/eu/europa/ec/edelivery/smp/data/model/doc/DBResourceFilterTest.java
index 773ac44fbe606ee2c4e22d0bd64c59a16da85ed1..1d9e33cb48e0cf54855542adc5889da1421ca8bf 100644
--- a/smp-server-library/src/test/java/eu/europa/ec/edelivery/smp/data/model/doc/DBResourceFilterTest.java
+++ b/smp-server-library/src/test/java/eu/europa/ec/edelivery/smp/data/model/doc/DBResourceFilterTest.java
@@ -2,7 +2,7 @@
* #START_LICENSE#
* smp-webapp
* %%
- * Copyright (C) 2017 - 2023 European Commission | eDelivery | DomiSMP
+ * Copyright (C) 2017 - 2024 European Commission | eDelivery | DomiSMP
* %%
* Licensed under the EUPL, Version 1.2 or – as soon they will be approved by the European Commission - subsequent
* versions of the EUPL (the "Licence");
@@ -18,7 +18,6 @@
*/
package eu.europa.ec.edelivery.smp.data.model.doc;
-import org.junit.jupiter.api.Assertions;
import org.junit.jupiter.api.Test;
import static org.junit.jupiter.api.Assertions.*;
@@ -27,10 +26,10 @@ import static org.junit.jupiter.api.Assertions.*;
* @author Sebastian-Ion TINCU
* @since 5.1
*/
-public class DBResourceFilterTest {
+class DBResourceFilterTest {
@Test
- public void wrapsFilterValueHavingPercentageCharacters() {
+ void wrapsFilterValueHavingPercentageCharacters() {
// GIVEN
DBResourceFilter filter = DBResourceFilter
.createBuilder()
@@ -41,6 +40,6 @@ public class DBResourceFilterTest {
String result = filter.getIdentifierFilter();
// THEN
- Assertions.assertEquals("%\\%%", result, "Should have wrapped the escaped '%' character around with two extra '%' characters");
+ assertEquals("%\\%%", result, "Should have wrapped the escaped '%' character around with two extra '%' characters");
}
-}
\ No newline at end of file
+}
diff --git a/smp-server-library/src/test/java/eu/europa/ec/edelivery/smp/data/ui/databind/SMPAuthorityDeserializerTest.java b/smp-server-library/src/test/java/eu/europa/ec/edelivery/smp/data/ui/databind/SMPAuthorityDeserializerTest.java
index b2f114e4d4da598c0467c654ec57adea99ee2d7c..d61601192dd7fed8395e49d735edd917e229d3df 100644
--- a/smp-server-library/src/test/java/eu/europa/ec/edelivery/smp/data/ui/databind/SMPAuthorityDeserializerTest.java
+++ b/smp-server-library/src/test/java/eu/europa/ec/edelivery/smp/data/ui/databind/SMPAuthorityDeserializerTest.java
@@ -2,7 +2,7 @@
* #START_LICENSE#
* smp-server-library
* %%
- * Copyright (C) 2017 - 2023 European Commission | eDelivery | DomiSMP
+ * Copyright (C) 2017 - 2024 European Commission | eDelivery | DomiSMP
* %%
* Licensed under the EUPL, Version 1.2 or – as soon they will be approved by the European Commission - subsequent
* versions of the EUPL (the "Licence");
diff --git a/smp-server-library/src/test/java/eu/europa/ec/edelivery/smp/identifiers/DocumentIdentifierFormatterTest.java b/smp-server-library/src/test/java/eu/europa/ec/edelivery/smp/identifiers/DocumentIdentifierFormatterTest.java
index 3b35a005564939c244cc0e62c098956f610ed6fd..308fc2786920e205d74039777fb9481f26d87bdb 100644
--- a/smp-server-library/src/test/java/eu/europa/ec/edelivery/smp/identifiers/DocumentIdentifierFormatterTest.java
+++ b/smp-server-library/src/test/java/eu/europa/ec/edelivery/smp/identifiers/DocumentIdentifierFormatterTest.java
@@ -2,7 +2,7 @@
* #START_LICENSE#
* smp-server-library
* %%
- * Copyright (C) 2017 - 2023 European Commission | eDelivery | DomiSMP
+ * Copyright (C) 2017 - 2024 European Commission | eDelivery | DomiSMP
* %%
* Licensed under the EUPL, Version 1.2 or – as soon they will be approved by the European Commission - subsequent
* versions of the EUPL (the "Licence");
diff --git a/smp-server-library/src/test/java/eu/europa/ec/edelivery/smp/identifiers/ParticipantIdentifierFormatterFormatTests.java b/smp-server-library/src/test/java/eu/europa/ec/edelivery/smp/identifiers/ParticipantIdentifierFormatterFormatTests.java
index 2f5ca30bd69cf87db505e979c8a49a0abd041442..6bcb2ec89caf79c92772702e5cc9a6d80c253ef1 100644
--- a/smp-server-library/src/test/java/eu/europa/ec/edelivery/smp/identifiers/ParticipantIdentifierFormatterFormatTests.java
+++ b/smp-server-library/src/test/java/eu/europa/ec/edelivery/smp/identifiers/ParticipantIdentifierFormatterFormatTests.java
@@ -2,7 +2,7 @@
* #START_LICENSE#
* smp-server-library
* %%
- * Copyright (C) 2017 - 2023 European Commission | eDelivery | DomiSMP
+ * Copyright (C) 2017 - 2024 European Commission | eDelivery | DomiSMP
* %%
* Licensed under the EUPL, Version 1.2 or – as soon they will be approved by the European Commission - subsequent
* versions of the EUPL (the "Licence");
diff --git a/smp-server-library/src/test/java/eu/europa/ec/edelivery/smp/identifiers/ParticipantIdentifierFormatterParseTests.java b/smp-server-library/src/test/java/eu/europa/ec/edelivery/smp/identifiers/ParticipantIdentifierFormatterParseTests.java
index d6684eaf9e7f4efc2ac8a857215426e2275e8f34..1d4a281e87e37f2fe424f9ec53596a4c37c09bf2 100644
--- a/smp-server-library/src/test/java/eu/europa/ec/edelivery/smp/identifiers/ParticipantIdentifierFormatterParseTests.java
+++ b/smp-server-library/src/test/java/eu/europa/ec/edelivery/smp/identifiers/ParticipantIdentifierFormatterParseTests.java
@@ -2,7 +2,7 @@
* #START_LICENSE#
* smp-server-library
* %%
- * Copyright (C) 2017 - 2023 European Commission | eDelivery | DomiSMP
+ * Copyright (C) 2017 - 2024 European Commission | eDelivery | DomiSMP
* %%
* Licensed under the EUPL, Version 1.2 or – as soon they will be approved by the European Commission - subsequent
* versions of the EUPL (the "Licence");
diff --git a/smp-server-library/src/test/java/eu/europa/ec/edelivery/smp/identifiers/types/EBCorePartyIdFormatterTypeTest.java b/smp-server-library/src/test/java/eu/europa/ec/edelivery/smp/identifiers/types/EBCorePartyIdFormatterTypeTest.java
index bf0f65d4726999c0d2f34d81afd8be9976dfacf6..36dd1d91a63a8ce2e68d52c85cbd32fdd41fbd0b 100644
--- a/smp-server-library/src/test/java/eu/europa/ec/edelivery/smp/identifiers/types/EBCorePartyIdFormatterTypeTest.java
+++ b/smp-server-library/src/test/java/eu/europa/ec/edelivery/smp/identifiers/types/EBCorePartyIdFormatterTypeTest.java
@@ -2,7 +2,7 @@
* #START_LICENSE#
* smp-server-library
* %%
- * Copyright (C) 2017 - 2023 European Commission | eDelivery | DomiSMP
+ * Copyright (C) 2017 - 2024 European Commission | eDelivery | DomiSMP
* %%
* Licensed under the EUPL, Version 1.2 or – as soon they will be approved by the European Commission - subsequent
* versions of the EUPL (the "Licence");
diff --git a/smp-server-library/src/test/java/eu/europa/ec/edelivery/smp/identifiers/types/OasisSMPFormatterTypeTest.java b/smp-server-library/src/test/java/eu/europa/ec/edelivery/smp/identifiers/types/OasisSMPFormatterTypeTest.java
index 0b1646352c8b5600877bf95719504d2b3b2cca18..20b8ba68481da87a707104565b4ff23f26779b53 100644
--- a/smp-server-library/src/test/java/eu/europa/ec/edelivery/smp/identifiers/types/OasisSMPFormatterTypeTest.java
+++ b/smp-server-library/src/test/java/eu/europa/ec/edelivery/smp/identifiers/types/OasisSMPFormatterTypeTest.java
@@ -2,7 +2,7 @@
* #START_LICENSE#
* smp-server-library
* %%
- * Copyright (C) 2017 - 2023 European Commission | eDelivery | DomiSMP
+ * Copyright (C) 2017 - 2024 European Commission | eDelivery | DomiSMP
* %%
* Licensed under the EUPL, Version 1.2 or – as soon they will be approved by the European Commission - subsequent
* versions of the EUPL (the "Licence");
diff --git a/smp-server-library/src/test/java/eu/europa/ec/edelivery/smp/identifiers/types/TemplateFormatterTypeTest.java b/smp-server-library/src/test/java/eu/europa/ec/edelivery/smp/identifiers/types/TemplateFormatterTypeTest.java
index b8c61e2c6c9ded5a01cf6627c44a507493588d3e..1d49468750bf6615a276f5ba8db0d0d51f6b8e51 100644
--- a/smp-server-library/src/test/java/eu/europa/ec/edelivery/smp/identifiers/types/TemplateFormatterTypeTest.java
+++ b/smp-server-library/src/test/java/eu/europa/ec/edelivery/smp/identifiers/types/TemplateFormatterTypeTest.java
@@ -2,7 +2,7 @@
* #START_LICENSE#
* smp-server-library
* %%
- * Copyright (C) 2017 - 2023 European Commission | eDelivery | DomiSMP
+ * Copyright (C) 2017 - 2024 European Commission | eDelivery | DomiSMP
* %%
* Licensed under the EUPL, Version 1.2 or – as soon they will be approved by the European Commission - subsequent
* versions of the EUPL (the "Licence");
diff --git a/smp-server-library/src/test/java/eu/europa/ec/edelivery/smp/security/DomainGuardTest.java b/smp-server-library/src/test/java/eu/europa/ec/edelivery/smp/security/DomainGuardTest.java
index 51c01c48080c2a9ee8a308a4f2f768dba54b9fa4..40697c84ffe409f20a07436e2711694cebd2f819 100644
--- a/smp-server-library/src/test/java/eu/europa/ec/edelivery/smp/security/DomainGuardTest.java
+++ b/smp-server-library/src/test/java/eu/europa/ec/edelivery/smp/security/DomainGuardTest.java
@@ -2,7 +2,7 @@
* #START_LICENSE#
* smp-server-library
* %%
- * Copyright (C) 2017 - 2023 European Commission | eDelivery | DomiSMP
+ * Copyright (C) 2017 - 2024 European Commission | eDelivery | DomiSMP
* %%
* Licensed under the EUPL, Version 1.2 or – as soon they will be approved by the European Commission - subsequent
* versions of the EUPL (the "Licence");
diff --git a/smp-server-library/src/test/java/eu/europa/ec/edelivery/smp/security/ResourceGuardTest.java b/smp-server-library/src/test/java/eu/europa/ec/edelivery/smp/security/ResourceGuardTest.java
index 087b848c3beced66568c0cba70dd3b5c07ab0c09..28022c29a50b2af4a3b748b039edbcc58b7d5874 100644
--- a/smp-server-library/src/test/java/eu/europa/ec/edelivery/smp/security/ResourceGuardTest.java
+++ b/smp-server-library/src/test/java/eu/europa/ec/edelivery/smp/security/ResourceGuardTest.java
@@ -2,7 +2,7 @@
* #START_LICENSE#
* smp-server-library
* %%
- * Copyright (C) 2017 - 2023 European Commission | eDelivery | DomiSMP
+ * Copyright (C) 2017 - 2024 European Commission | eDelivery | DomiSMP
* %%
* Licensed under the EUPL, Version 1.2 or – as soon they will be approved by the European Commission - subsequent
* versions of the EUPL (the "Licence");
@@ -22,7 +22,6 @@ import eu.europa.ec.edelivery.smp.auth.SMPUserDetails;
import eu.europa.ec.edelivery.smp.data.dao.AbstractJunit5BaseDao;
import eu.europa.ec.edelivery.smp.data.enums.VisibilityType;
import eu.europa.ec.edelivery.smp.servlet.ResourceAction;
-import eu.europa.ec.edelivery.smp.servlet.ResourceRequest;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.params.ParameterizedTest;
diff --git a/smp-server-library/src/test/java/eu/europa/ec/edelivery/smp/services/AbstractServiceIntegrationTest.java b/smp-server-library/src/test/java/eu/europa/ec/edelivery/smp/services/AbstractServiceIntegrationTest.java
index c52857a2802c5fb44c21083d3a257d5cc5a32ac5..6da63a762d8755207d6ae81acfc0db653af67161 100644
--- a/smp-server-library/src/test/java/eu/europa/ec/edelivery/smp/services/AbstractServiceIntegrationTest.java
+++ b/smp-server-library/src/test/java/eu/europa/ec/edelivery/smp/services/AbstractServiceIntegrationTest.java
@@ -2,7 +2,7 @@
* #START_LICENSE#
* smp-server-library
* %%
- * Copyright (C) 2017 - 2023 European Commission | eDelivery | DomiSMP
+ * Copyright (C) 2017 - 2024 European Commission | eDelivery | DomiSMP
* %%
* Licensed under the EUPL, Version 1.2 or – as soon they will be approved by the European Commission - subsequent
* versions of the EUPL (the "Licence");
diff --git a/smp-server-library/src/test/java/eu/europa/ec/edelivery/smp/services/AbstractServiceTest.java b/smp-server-library/src/test/java/eu/europa/ec/edelivery/smp/services/AbstractServiceTest.java
index 5ce391f3a1422a60dde76cfa52eab67a85fc59fa..f787b5639cb4a3e6f3d5ee57415dbd1a6da3db2d 100644
--- a/smp-server-library/src/test/java/eu/europa/ec/edelivery/smp/services/AbstractServiceTest.java
+++ b/smp-server-library/src/test/java/eu/europa/ec/edelivery/smp/services/AbstractServiceTest.java
@@ -2,7 +2,7 @@
* #START_LICENSE#
* smp-server-library
* %%
- * Copyright (C) 2017 - 2023 European Commission | eDelivery | DomiSMP
+ * Copyright (C) 2017 - 2024 European Commission | eDelivery | DomiSMP
* %%
* Licensed under the EUPL, Version 1.2 or – as soon they will be approved by the European Commission - subsequent
* versions of the EUPL (the "Licence");
diff --git a/smp-server-library/src/test/java/eu/europa/ec/edelivery/smp/services/AlertServiceTest.java b/smp-server-library/src/test/java/eu/europa/ec/edelivery/smp/services/AlertServiceTest.java
index 6f2bb54847b7fc77d9530f1f855ec757c78d678a..394235222ed07eda93ace1be5f54ffd684897df1 100644
--- a/smp-server-library/src/test/java/eu/europa/ec/edelivery/smp/services/AlertServiceTest.java
+++ b/smp-server-library/src/test/java/eu/europa/ec/edelivery/smp/services/AlertServiceTest.java
@@ -2,7 +2,7 @@
* #START_LICENSE#
* smp-server-library
* %%
- * Copyright (C) 2017 - 2023 European Commission | eDelivery | DomiSMP
+ * Copyright (C) 2017 - 2024 European Commission | eDelivery | DomiSMP
* %%
* Licensed under the EUPL, Version 1.2 or – as soon they will be approved by the European Commission - subsequent
* versions of the EUPL (the "Licence");
diff --git a/smp-server-library/src/test/java/eu/europa/ec/edelivery/smp/services/CRLVerifierServiceTest.java b/smp-server-library/src/test/java/eu/europa/ec/edelivery/smp/services/CRLVerifierServiceTest.java
index de0cc1036d6e9775b7e4ce0790a4a444fed64527..70c1fee848301e80906bc86bb0cc95ca64e3ab6c 100644
--- a/smp-server-library/src/test/java/eu/europa/ec/edelivery/smp/services/CRLVerifierServiceTest.java
+++ b/smp-server-library/src/test/java/eu/europa/ec/edelivery/smp/services/CRLVerifierServiceTest.java
@@ -2,7 +2,7 @@
* #START_LICENSE#
* smp-server-library
* %%
- * Copyright (C) 2017 - 2023 European Commission | eDelivery | DomiSMP
+ * Copyright (C) 2017 - 2024 European Commission | eDelivery | DomiSMP
* %%
* Licensed under the EUPL, Version 1.2 or – as soon they will be approved by the European Commission - subsequent
* versions of the EUPL (the "Licence");
diff --git a/smp-server-library/src/test/java/eu/europa/ec/edelivery/smp/services/ConfigurationServiceAllGetMethodsTest.java b/smp-server-library/src/test/java/eu/europa/ec/edelivery/smp/services/ConfigurationServiceAllGetMethodsTest.java
index 728ccc4bce9cf727a41ac7e1460a409765697daa..a06ab85780e1a47f59cb68174c4f216ca52f4671 100644
--- a/smp-server-library/src/test/java/eu/europa/ec/edelivery/smp/services/ConfigurationServiceAllGetMethodsTest.java
+++ b/smp-server-library/src/test/java/eu/europa/ec/edelivery/smp/services/ConfigurationServiceAllGetMethodsTest.java
@@ -2,7 +2,7 @@
* #START_LICENSE#
* smp-server-library
* %%
- * Copyright (C) 2017 - 2023 European Commission | eDelivery | DomiSMP
+ * Copyright (C) 2017 - 2024 European Commission | eDelivery | DomiSMP
* %%
* Licensed under the EUPL, Version 1.2 or – as soon they will be approved by the European Commission - subsequent
* versions of the EUPL (the "Licence");
@@ -23,7 +23,6 @@ import eu.europa.ec.edelivery.smp.data.dao.ConfigurationDao;
import eu.europa.ec.edelivery.smp.data.ui.enums.AlertLevelEnum;
import org.apache.commons.lang3.exception.ExceptionUtils;
import org.apache.commons.lang3.reflect.MethodUtils;
-import org.junit.jupiter.api.Test;
import org.junit.jupiter.params.ParameterizedTest;
import org.junit.jupiter.params.provider.MethodSource;
diff --git a/smp-server-library/src/test/java/eu/europa/ec/edelivery/smp/services/ConfigurationServiceTest.java b/smp-server-library/src/test/java/eu/europa/ec/edelivery/smp/services/ConfigurationServiceTest.java
index 94a421077b7f053a93a8cdea54a5588edf99dc0a..7d11c60fc7de0e5a391bc2519117502fb4ccb847 100644
--- a/smp-server-library/src/test/java/eu/europa/ec/edelivery/smp/services/ConfigurationServiceTest.java
+++ b/smp-server-library/src/test/java/eu/europa/ec/edelivery/smp/services/ConfigurationServiceTest.java
@@ -2,7 +2,7 @@
* #START_LICENSE#
* smp-server-library
* %%
- * Copyright (C) 2017 - 2023 European Commission | eDelivery | DomiSMP
+ * Copyright (C) 2017 - 2024 European Commission | eDelivery | DomiSMP
* %%
* Licensed under the EUPL, Version 1.2 or – as soon they will be approved by the European Commission - subsequent
* versions of the EUPL (the "Licence");
diff --git a/smp-server-library/src/test/java/eu/europa/ec/edelivery/smp/services/CredentialServiceTest.java b/smp-server-library/src/test/java/eu/europa/ec/edelivery/smp/services/CredentialServiceTest.java
index 620af6a07b718020ca24ab06761c377183953dc4..732c3e758e13e0bbb1536583c90f360c6e2ef1ce 100644
--- a/smp-server-library/src/test/java/eu/europa/ec/edelivery/smp/services/CredentialServiceTest.java
+++ b/smp-server-library/src/test/java/eu/europa/ec/edelivery/smp/services/CredentialServiceTest.java
@@ -2,7 +2,7 @@
* #START_LICENSE#
* smp-server-library
* %%
- * Copyright (C) 2017 - 2023 European Commission | eDelivery | DomiSMP
+ * Copyright (C) 2017 - 2024 European Commission | eDelivery | DomiSMP
* %%
* Licensed under the EUPL, Version 1.2 or – as soon they will be approved by the European Commission - subsequent
* versions of the EUPL (the "Licence");
diff --git a/smp-server-library/src/test/java/eu/europa/ec/edelivery/smp/services/CredentialValidatorServiceTest.java b/smp-server-library/src/test/java/eu/europa/ec/edelivery/smp/services/CredentialValidatorServiceTest.java
index 13ef4af363bfc3c31289b5fe697f324901f179b6..f4e469b3f7b5f99cc69976b25c5004c2af918c4c 100644
--- a/smp-server-library/src/test/java/eu/europa/ec/edelivery/smp/services/CredentialValidatorServiceTest.java
+++ b/smp-server-library/src/test/java/eu/europa/ec/edelivery/smp/services/CredentialValidatorServiceTest.java
@@ -2,7 +2,7 @@
* #START_LICENSE#
* smp-server-library
* %%
- * Copyright (C) 2017 - 2023 European Commission | eDelivery | DomiSMP
+ * Copyright (C) 2017 - 2024 European Commission | eDelivery | DomiSMP
* %%
* Licensed under the EUPL, Version 1.2 or – as soon they will be approved by the European Commission - subsequent
* versions of the EUPL (the "Licence");
diff --git a/smp-server-library/src/test/java/eu/europa/ec/edelivery/smp/services/DomainServiceTest.java b/smp-server-library/src/test/java/eu/europa/ec/edelivery/smp/services/DomainServiceTest.java
index dd9fc1aafb586281f3513bc2b2a057eeb760f5c9..36c133be6bbba07c1c8a9963f7191deea9a38105 100644
--- a/smp-server-library/src/test/java/eu/europa/ec/edelivery/smp/services/DomainServiceTest.java
+++ b/smp-server-library/src/test/java/eu/europa/ec/edelivery/smp/services/DomainServiceTest.java
@@ -2,7 +2,7 @@
* #START_LICENSE#
* smp-webapp
* %%
- * Copyright (C) 2017 - 2023 European Commission | eDelivery | DomiSMP
+ * Copyright (C) 2017 - 2024 European Commission | eDelivery | DomiSMP
* %%
* Licensed under the EUPL, Version 1.2 or – as soon they will be approved by the European Commission - subsequent
* versions of the EUPL (the "Licence");
diff --git a/smp-server-library/src/test/java/eu/europa/ec/edelivery/smp/services/PayloadValidatorServiceTest.java b/smp-server-library/src/test/java/eu/europa/ec/edelivery/smp/services/PayloadValidatorServiceTest.java
index 05b508266e9d34e843e0d28fc16187d33185f42c..30ba787506c9a98c1e3b2e16635ca2642cf870d6 100644
--- a/smp-server-library/src/test/java/eu/europa/ec/edelivery/smp/services/PayloadValidatorServiceTest.java
+++ b/smp-server-library/src/test/java/eu/europa/ec/edelivery/smp/services/PayloadValidatorServiceTest.java
@@ -2,7 +2,7 @@
* #START_LICENSE#
* smp-server-library
* %%
- * Copyright (C) 2017 - 2023 European Commission | eDelivery | DomiSMP
+ * Copyright (C) 2017 - 2024 European Commission | eDelivery | DomiSMP
* %%
* Licensed under the EUPL, Version 1.2 or – as soon they will be approved by the European Commission - subsequent
* versions of the EUPL (the "Licence");
diff --git a/smp-server-library/src/test/java/eu/europa/ec/edelivery/smp/services/SMLIntegrationServiceTest.java b/smp-server-library/src/test/java/eu/europa/ec/edelivery/smp/services/SMLIntegrationServiceTest.java
index 7d0aabff69cebdbea5f652d6dd0005700609b26b..7af5a4e89fa4c3c5f393b114c7dcaf325848f20a 100644
--- a/smp-server-library/src/test/java/eu/europa/ec/edelivery/smp/services/SMLIntegrationServiceTest.java
+++ b/smp-server-library/src/test/java/eu/europa/ec/edelivery/smp/services/SMLIntegrationServiceTest.java
@@ -2,7 +2,7 @@
* #START_LICENSE#
* smp-webapp
* %%
- * Copyright (C) 2017 - 2023 European Commission | eDelivery | DomiSMP
+ * Copyright (C) 2017 - 2024 European Commission | eDelivery | DomiSMP
* %%
* Licensed under the EUPL, Version 1.2 or – as soon they will be approved by the European Commission - subsequent
* versions of the EUPL (the "Licence");
diff --git a/smp-server-library/src/test/java/eu/europa/ec/edelivery/smp/services/ServiceMetadataSignerTest.java b/smp-server-library/src/test/java/eu/europa/ec/edelivery/smp/services/ServiceMetadataSignerTest.java
index 8d654018c0df80116366b96336ac87042bc8e863..25accf15a15439e318cac361e736ac35fd324357 100644
--- a/smp-server-library/src/test/java/eu/europa/ec/edelivery/smp/services/ServiceMetadataSignerTest.java
+++ b/smp-server-library/src/test/java/eu/europa/ec/edelivery/smp/services/ServiceMetadataSignerTest.java
@@ -2,7 +2,7 @@
* #START_LICENSE#
* smp-webapp
* %%
- * Copyright (C) 2017 - 2023 European Commission | eDelivery | DomiSMP
+ * Copyright (C) 2017 - 2024 European Commission | eDelivery | DomiSMP
* %%
* Licensed under the EUPL, Version 1.2 or – as soon they will be approved by the European Commission - subsequent
* versions of the EUPL (the "Licence");
diff --git a/smp-server-library/src/test/java/eu/europa/ec/edelivery/smp/services/mail/MailServiceTest.java b/smp-server-library/src/test/java/eu/europa/ec/edelivery/smp/services/mail/MailServiceTest.java
index 699f305cf5c5a5f11b2f672a62d79550a7230b8e..99c8f912fb3e7694c73283a23f50693840c6db25 100644
--- a/smp-server-library/src/test/java/eu/europa/ec/edelivery/smp/services/mail/MailServiceTest.java
+++ b/smp-server-library/src/test/java/eu/europa/ec/edelivery/smp/services/mail/MailServiceTest.java
@@ -2,7 +2,7 @@
* #START_LICENSE#
* smp-server-library
* %%
- * Copyright (C) 2017 - 2023 European Commission | eDelivery | DomiSMP
+ * Copyright (C) 2017 - 2024 European Commission | eDelivery | DomiSMP
* %%
* Licensed under the EUPL, Version 1.2 or – as soon they will be approved by the European Commission - subsequent
* versions of the EUPL (the "Licence");
diff --git a/smp-server-library/src/test/java/eu/europa/ec/edelivery/smp/services/mail/MailTemplateTest.java b/smp-server-library/src/test/java/eu/europa/ec/edelivery/smp/services/mail/MailTemplateTest.java
index 13b60583585aa1d116363309ad683f308adbf0fc..1bea4fd48bd7567aa81a9226bf3762c4f9f24c2b 100644
--- a/smp-server-library/src/test/java/eu/europa/ec/edelivery/smp/services/mail/MailTemplateTest.java
+++ b/smp-server-library/src/test/java/eu/europa/ec/edelivery/smp/services/mail/MailTemplateTest.java
@@ -2,7 +2,7 @@
* #START_LICENSE#
* smp-server-library
* %%
- * Copyright (C) 2017 - 2023 European Commission | eDelivery | DomiSMP
+ * Copyright (C) 2017 - 2024 European Commission | eDelivery | DomiSMP
* %%
* Licensed under the EUPL, Version 1.2 or – as soon they will be approved by the European Commission - subsequent
* versions of the EUPL (the "Licence");
diff --git a/smp-server-library/src/test/java/eu/europa/ec/edelivery/smp/services/resource/ResourceHandlerServiceTest.java b/smp-server-library/src/test/java/eu/europa/ec/edelivery/smp/services/resource/ResourceHandlerServiceTest.java
index 9ca3f68c3d50ef926a930d21f5798e936cbe4b10..bd7ac1afb74c71f68dfde7e944fd439d40880e65 100644
--- a/smp-server-library/src/test/java/eu/europa/ec/edelivery/smp/services/resource/ResourceHandlerServiceTest.java
+++ b/smp-server-library/src/test/java/eu/europa/ec/edelivery/smp/services/resource/ResourceHandlerServiceTest.java
@@ -2,7 +2,7 @@
* #START_LICENSE#
* smp-server-library
* %%
- * Copyright (C) 2017 - 2023 European Commission | eDelivery | DomiSMP
+ * Copyright (C) 2017 - 2024 European Commission | eDelivery | DomiSMP
* %%
* Licensed under the EUPL, Version 1.2 or – as soon they will be approved by the European Commission - subsequent
* versions of the EUPL (the "Licence");
diff --git a/smp-server-library/src/test/java/eu/europa/ec/edelivery/smp/services/resource/ResourceResolverServiceTest.java b/smp-server-library/src/test/java/eu/europa/ec/edelivery/smp/services/resource/ResourceResolverServiceTest.java
index d5b793873c403cf67764670ce73b35019ed8f907..34824da8bc2534ecb613d39c50311a0c73c0173a 100644
--- a/smp-server-library/src/test/java/eu/europa/ec/edelivery/smp/services/resource/ResourceResolverServiceTest.java
+++ b/smp-server-library/src/test/java/eu/europa/ec/edelivery/smp/services/resource/ResourceResolverServiceTest.java
@@ -2,7 +2,7 @@
* #START_LICENSE#
* smp-server-library
* %%
- * Copyright (C) 2017 - 2023 European Commission | eDelivery | DomiSMP
+ * Copyright (C) 2017 - 2024 European Commission | eDelivery | DomiSMP
* %%
* Licensed under the EUPL, Version 1.2 or – as soon they will be approved by the European Commission - subsequent
* versions of the EUPL (the "Licence");
diff --git a/smp-server-library/src/test/java/eu/europa/ec/edelivery/smp/services/resource/ResourceServiceTest.java b/smp-server-library/src/test/java/eu/europa/ec/edelivery/smp/services/resource/ResourceServiceTest.java
index 93a5fa58cf8d2549e5d5a281c48edb00dfa489b5..c7017abbc1f3e75df054fd935c21aa38ba14d805 100644
--- a/smp-server-library/src/test/java/eu/europa/ec/edelivery/smp/services/resource/ResourceServiceTest.java
+++ b/smp-server-library/src/test/java/eu/europa/ec/edelivery/smp/services/resource/ResourceServiceTest.java
@@ -2,7 +2,7 @@
* #START_LICENSE#
* smp-server-library
* %%
- * Copyright (C) 2017 - 2023 European Commission | eDelivery | DomiSMP
+ * Copyright (C) 2017 - 2024 European Commission | eDelivery | DomiSMP
* %%
* Licensed under the EUPL, Version 1.2 or – as soon they will be approved by the European Commission - subsequent
* versions of the EUPL (the "Licence");
diff --git a/smp-server-library/src/test/java/eu/europa/ec/edelivery/smp/services/ui/UIAlertServiceIntegrationTest.java b/smp-server-library/src/test/java/eu/europa/ec/edelivery/smp/services/ui/UIAlertServiceIntegrationTest.java
index 1770d8ef3b40df3b324f898406eb794ffba6f7b6..9386ef4cd6f6309e01fd39daf52d56f097ed71c0 100644
--- a/smp-server-library/src/test/java/eu/europa/ec/edelivery/smp/services/ui/UIAlertServiceIntegrationTest.java
+++ b/smp-server-library/src/test/java/eu/europa/ec/edelivery/smp/services/ui/UIAlertServiceIntegrationTest.java
@@ -2,7 +2,7 @@
* #START_LICENSE#
* smp-server-library
* %%
- * Copyright (C) 2017 - 2023 European Commission | eDelivery | DomiSMP
+ * Copyright (C) 2017 - 2024 European Commission | eDelivery | DomiSMP
* %%
* Licensed under the EUPL, Version 1.2 or – as soon they will be approved by the European Commission - subsequent
* versions of the EUPL (the "Licence");
diff --git a/smp-server-library/src/test/java/eu/europa/ec/edelivery/smp/services/ui/UIDocumentServiceTest.java b/smp-server-library/src/test/java/eu/europa/ec/edelivery/smp/services/ui/UIDocumentServiceTest.java
index 7dc3d4ac41fcac0040a46a53c7d4172dc24084d4..052ece3bc77bd5b15dbe1b9fab3d75a5f51e29ec 100644
--- a/smp-server-library/src/test/java/eu/europa/ec/edelivery/smp/services/ui/UIDocumentServiceTest.java
+++ b/smp-server-library/src/test/java/eu/europa/ec/edelivery/smp/services/ui/UIDocumentServiceTest.java
@@ -2,7 +2,7 @@
* #START_LICENSE#
* smp-server-library
* %%
- * Copyright (C) 2017 - 2023 European Commission | eDelivery | DomiSMP
+ * Copyright (C) 2017 - 2024 European Commission | eDelivery | DomiSMP
* %%
* Licensed under the EUPL, Version 1.2 or – as soon they will be approved by the European Commission - subsequent
* versions of the EUPL (the "Licence");
diff --git a/smp-server-library/src/test/java/eu/europa/ec/edelivery/smp/services/ui/UIDomainPublicServiceTest.java b/smp-server-library/src/test/java/eu/europa/ec/edelivery/smp/services/ui/UIDomainPublicServiceTest.java
index 474557f6d4da76d0d9a9fc8cb21b58a6a938ef5a..f32cbcdca9a55082d2693c3cbe23385933c7d71c 100644
--- a/smp-server-library/src/test/java/eu/europa/ec/edelivery/smp/services/ui/UIDomainPublicServiceTest.java
+++ b/smp-server-library/src/test/java/eu/europa/ec/edelivery/smp/services/ui/UIDomainPublicServiceTest.java
@@ -2,7 +2,7 @@
* #START_LICENSE#
* smp-server-library
* %%
- * Copyright (C) 2017 - 2023 European Commission | eDelivery | DomiSMP
+ * Copyright (C) 2017 - 2024 European Commission | eDelivery | DomiSMP
* %%
* Licensed under the EUPL, Version 1.2 or – as soon they will be approved by the European Commission - subsequent
* versions of the EUPL (the "Licence");
diff --git a/smp-server-library/src/test/java/eu/europa/ec/edelivery/smp/services/ui/UIDomainServiceIntegrationTest.java b/smp-server-library/src/test/java/eu/europa/ec/edelivery/smp/services/ui/UIDomainServiceIntegrationTest.java
index 949a433c8ba2ffdc05de8ff5252f606004effd97..50eb21ef250eb0611c1fdca9d82334d91a704b27 100644
--- a/smp-server-library/src/test/java/eu/europa/ec/edelivery/smp/services/ui/UIDomainServiceIntegrationTest.java
+++ b/smp-server-library/src/test/java/eu/europa/ec/edelivery/smp/services/ui/UIDomainServiceIntegrationTest.java
@@ -2,7 +2,7 @@
* #START_LICENSE#
* smp-server-library
* %%
- * Copyright (C) 2017 - 2023 European Commission | eDelivery | DomiSMP
+ * Copyright (C) 2017 - 2024 European Commission | eDelivery | DomiSMP
* %%
* Licensed under the EUPL, Version 1.2 or – as soon they will be approved by the European Commission - subsequent
* versions of the EUPL (the "Licence");
diff --git a/smp-server-library/src/test/java/eu/europa/ec/edelivery/smp/services/ui/UIDomainServiceTest.java b/smp-server-library/src/test/java/eu/europa/ec/edelivery/smp/services/ui/UIDomainServiceTest.java
index ebf7532c662c1f26a2d316e9bd47b321595b1dbf..730010ab7563f765133f2fade4fe9f06bf7d9c25 100644
--- a/smp-server-library/src/test/java/eu/europa/ec/edelivery/smp/services/ui/UIDomainServiceTest.java
+++ b/smp-server-library/src/test/java/eu/europa/ec/edelivery/smp/services/ui/UIDomainServiceTest.java
@@ -2,7 +2,7 @@
* #START_LICENSE#
* smp-server-library
* %%
- * Copyright (C) 2017 - 2023 European Commission | eDelivery | DomiSMP
+ * Copyright (C) 2017 - 2024 European Commission | eDelivery | DomiSMP
* %%
* Licensed under the EUPL, Version 1.2 or – as soon they will be approved by the European Commission - subsequent
* versions of the EUPL (the "Licence");
diff --git a/smp-server-library/src/test/java/eu/europa/ec/edelivery/smp/services/ui/UIGroupPublicServiceTest.java b/smp-server-library/src/test/java/eu/europa/ec/edelivery/smp/services/ui/UIGroupPublicServiceTest.java
index 57f6e8722d1579eee4c314dae5579cb9d0cda6e6..34ef45683eaba757fb8d8729fc2ad570d160ca6f 100644
--- a/smp-server-library/src/test/java/eu/europa/ec/edelivery/smp/services/ui/UIGroupPublicServiceTest.java
+++ b/smp-server-library/src/test/java/eu/europa/ec/edelivery/smp/services/ui/UIGroupPublicServiceTest.java
@@ -2,7 +2,7 @@
* #START_LICENSE#
* smp-server-library
* %%
- * Copyright (C) 2017 - 2023 European Commission | eDelivery | DomiSMP
+ * Copyright (C) 2017 - 2024 European Commission | eDelivery | DomiSMP
* %%
* Licensed under the EUPL, Version 1.2 or – as soon they will be approved by the European Commission - subsequent
* versions of the EUPL (the "Licence");
@@ -39,8 +39,6 @@ import java.util.UUID;
import static org.junit.jupiter.api.Assertions.*;
-import static org.junit.jupiter.api.Assertions.assertNotEquals;
-
class UIGroupPublicServiceTest extends AbstractJunit5BaseDao {
diff --git a/smp-server-library/src/test/java/eu/europa/ec/edelivery/smp/services/ui/UIKeystoreServiceTest.java b/smp-server-library/src/test/java/eu/europa/ec/edelivery/smp/services/ui/UIKeystoreServiceTest.java
index 72085836993ac1e81ae8ef9a2cf0cc2dfe4839bf..39578d945898c33354c994b9d673219c0dc08fe4 100644
--- a/smp-server-library/src/test/java/eu/europa/ec/edelivery/smp/services/ui/UIKeystoreServiceTest.java
+++ b/smp-server-library/src/test/java/eu/europa/ec/edelivery/smp/services/ui/UIKeystoreServiceTest.java
@@ -2,7 +2,7 @@
* #START_LICENSE#
* smp-server-library
* %%
- * Copyright (C) 2017 - 2023 European Commission | eDelivery | DomiSMP
+ * Copyright (C) 2017 - 2024 European Commission | eDelivery | DomiSMP
* %%
* Licensed under the EUPL, Version 1.2 or – as soon they will be approved by the European Commission - subsequent
* versions of the EUPL (the "Licence");
diff --git a/smp-server-library/src/test/java/eu/europa/ec/edelivery/smp/services/ui/UIPropertyServiceIntegrationTest.java b/smp-server-library/src/test/java/eu/europa/ec/edelivery/smp/services/ui/UIPropertyServiceIntegrationTest.java
index f10c119086e10014ce316724ed6aa06bfd8b94f8..5ca9158e4c99f7eed518375fd8ad0651f179f1f2 100644
--- a/smp-server-library/src/test/java/eu/europa/ec/edelivery/smp/services/ui/UIPropertyServiceIntegrationTest.java
+++ b/smp-server-library/src/test/java/eu/europa/ec/edelivery/smp/services/ui/UIPropertyServiceIntegrationTest.java
@@ -2,7 +2,7 @@
* #START_LICENSE#
* smp-server-library
* %%
- * Copyright (C) 2017 - 2023 European Commission | eDelivery | DomiSMP
+ * Copyright (C) 2017 - 2024 European Commission | eDelivery | DomiSMP
* %%
* Licensed under the EUPL, Version 1.2 or – as soon they will be approved by the European Commission - subsequent
* versions of the EUPL (the "Licence");
diff --git a/smp-server-library/src/test/java/eu/europa/ec/edelivery/smp/services/ui/UIResourceSearchServiceTest.java b/smp-server-library/src/test/java/eu/europa/ec/edelivery/smp/services/ui/UIResourceSearchServiceTest.java
index 14b3af0d1007d9121f9d18193e64b329ed11293e..1418b3dff71269f6cabe70a781681954104ddc30 100644
--- a/smp-server-library/src/test/java/eu/europa/ec/edelivery/smp/services/ui/UIResourceSearchServiceTest.java
+++ b/smp-server-library/src/test/java/eu/europa/ec/edelivery/smp/services/ui/UIResourceSearchServiceTest.java
@@ -2,7 +2,7 @@
* #START_LICENSE#
* smp-server-library
* %%
- * Copyright (C) 2017 - 2023 European Commission | eDelivery | DomiSMP
+ * Copyright (C) 2017 - 2024 European Commission | eDelivery | DomiSMP
* %%
* Licensed under the EUPL, Version 1.2 or – as soon they will be approved by the European Commission - subsequent
* versions of the EUPL (the "Licence");
diff --git a/smp-server-library/src/test/java/eu/europa/ec/edelivery/smp/services/ui/UIResourceServiceTest.java b/smp-server-library/src/test/java/eu/europa/ec/edelivery/smp/services/ui/UIResourceServiceTest.java
index 7ec8d231ce37395d8f658e82d87a6e8971ae71ea..dac2c4cd277d92c31863bcec101e4ebf3133eac3 100644
--- a/smp-server-library/src/test/java/eu/europa/ec/edelivery/smp/services/ui/UIResourceServiceTest.java
+++ b/smp-server-library/src/test/java/eu/europa/ec/edelivery/smp/services/ui/UIResourceServiceTest.java
@@ -2,7 +2,7 @@
* #START_LICENSE#
* smp-server-library
* %%
- * Copyright (C) 2017 - 2023 European Commission | eDelivery | DomiSMP
+ * Copyright (C) 2017 - 2024 European Commission | eDelivery | DomiSMP
* %%
* Licensed under the EUPL, Version 1.2 or – as soon they will be approved by the European Commission - subsequent
* versions of the EUPL (the "Licence");
diff --git a/smp-server-library/src/test/java/eu/europa/ec/edelivery/smp/services/ui/UISubresourceServiceTest.java b/smp-server-library/src/test/java/eu/europa/ec/edelivery/smp/services/ui/UISubresourceServiceTest.java
index 47e20bf7276cc367de57f96ecd82b4244d021a19..493ffef1960c12c85cb1cc446dc97b7bc5010288 100644
--- a/smp-server-library/src/test/java/eu/europa/ec/edelivery/smp/services/ui/UISubresourceServiceTest.java
+++ b/smp-server-library/src/test/java/eu/europa/ec/edelivery/smp/services/ui/UISubresourceServiceTest.java
@@ -2,7 +2,7 @@
* #START_LICENSE#
* smp-server-library
* %%
- * Copyright (C) 2017 - 2023 European Commission | eDelivery | DomiSMP
+ * Copyright (C) 2017 - 2024 European Commission | eDelivery | DomiSMP
* %%
* Licensed under the EUPL, Version 1.2 or – as soon they will be approved by the European Commission - subsequent
* versions of the EUPL (the "Licence");
diff --git a/smp-server-library/src/test/java/eu/europa/ec/edelivery/smp/services/ui/UITruststoreServiceIntegrationTest.java b/smp-server-library/src/test/java/eu/europa/ec/edelivery/smp/services/ui/UITruststoreServiceIntegrationTest.java
index f1192ae84ac2188e09fe93e8cd750a4c7cac9a3c..a0c3eab565b548d27d0191521de4528f5b6d50ef 100644
--- a/smp-server-library/src/test/java/eu/europa/ec/edelivery/smp/services/ui/UITruststoreServiceIntegrationTest.java
+++ b/smp-server-library/src/test/java/eu/europa/ec/edelivery/smp/services/ui/UITruststoreServiceIntegrationTest.java
@@ -2,7 +2,7 @@
* #START_LICENSE#
* smp-server-library
* %%
- * Copyright (C) 2017 - 2023 European Commission | eDelivery | DomiSMP
+ * Copyright (C) 2017 - 2024 European Commission | eDelivery | DomiSMP
* %%
* Licensed under the EUPL, Version 1.2 or – as soon they will be approved by the European Commission - subsequent
* versions of the EUPL (the "Licence");
diff --git a/smp-server-library/src/test/java/eu/europa/ec/edelivery/smp/services/ui/UITruststoreServiceTest.java b/smp-server-library/src/test/java/eu/europa/ec/edelivery/smp/services/ui/UITruststoreServiceTest.java
index d8218b2e0f070bd62ac6085316ed30ee70777b67..c0f61e8866d70a8df9ec222d0ebbff95dfa15cdc 100644
--- a/smp-server-library/src/test/java/eu/europa/ec/edelivery/smp/services/ui/UITruststoreServiceTest.java
+++ b/smp-server-library/src/test/java/eu/europa/ec/edelivery/smp/services/ui/UITruststoreServiceTest.java
@@ -2,7 +2,7 @@
* #START_LICENSE#
* smp-server-library
* %%
- * Copyright (C) 2017 - 2023 European Commission | eDelivery | DomiSMP
+ * Copyright (C) 2017 - 2024 European Commission | eDelivery | DomiSMP
* %%
* Licensed under the EUPL, Version 1.2 or – as soon they will be approved by the European Commission - subsequent
* versions of the EUPL (the "Licence");
diff --git a/smp-server-library/src/test/java/eu/europa/ec/edelivery/smp/services/ui/UIUserServiceIntegrationTest.java b/smp-server-library/src/test/java/eu/europa/ec/edelivery/smp/services/ui/UIUserServiceIntegrationTest.java
index c1d6056c33cfd98a3da602dfe1e52aabd57a8aa0..3ef1ec67c4fd874d7d478e0336d3c32012a8dc5f 100644
--- a/smp-server-library/src/test/java/eu/europa/ec/edelivery/smp/services/ui/UIUserServiceIntegrationTest.java
+++ b/smp-server-library/src/test/java/eu/europa/ec/edelivery/smp/services/ui/UIUserServiceIntegrationTest.java
@@ -2,7 +2,7 @@
* #START_LICENSE#
* smp-server-library
* %%
- * Copyright (C) 2017 - 2023 European Commission | eDelivery | DomiSMP
+ * Copyright (C) 2017 - 2024 European Commission | eDelivery | DomiSMP
* %%
* Licensed under the EUPL, Version 1.2 or – as soon they will be approved by the European Commission - subsequent
* versions of the EUPL (the "Licence");
diff --git a/smp-server-library/src/test/java/eu/europa/ec/edelivery/smp/servlet/ResourceResponseTest.java b/smp-server-library/src/test/java/eu/europa/ec/edelivery/smp/servlet/ResourceResponseTest.java
index 02872016fc8609b0484fc2c5a3d612189c7c1284..403ce8be56d6611ba235516ba0ea9efc83acc661 100644
--- a/smp-server-library/src/test/java/eu/europa/ec/edelivery/smp/servlet/ResourceResponseTest.java
+++ b/smp-server-library/src/test/java/eu/europa/ec/edelivery/smp/servlet/ResourceResponseTest.java
@@ -2,7 +2,7 @@
* #START_LICENSE#
* smp-server-library
* %%
- * Copyright (C) 2017 - 2023 European Commission | eDelivery | DomiSMP
+ * Copyright (C) 2017 - 2024 European Commission | eDelivery | DomiSMP
* %%
* Licensed under the EUPL, Version 1.2 or – as soon they will be approved by the European Commission - subsequent
* versions of the EUPL (the "Licence");
diff --git a/smp-server-library/src/test/java/eu/europa/ec/edelivery/smp/sml/SmlClientFactoryAuthenticationByClientCertFromKeystoreTest.java b/smp-server-library/src/test/java/eu/europa/ec/edelivery/smp/sml/SmlClientFactoryAuthenticationByClientCertFromKeystoreTest.java
index 0945060f4a98a323f84fd25cd0ca3bd39627c29f..04e6c678a9497a41fa67dca7c2d7865f478cfb3c 100644
--- a/smp-server-library/src/test/java/eu/europa/ec/edelivery/smp/sml/SmlClientFactoryAuthenticationByClientCertFromKeystoreTest.java
+++ b/smp-server-library/src/test/java/eu/europa/ec/edelivery/smp/sml/SmlClientFactoryAuthenticationByClientCertFromKeystoreTest.java
@@ -2,7 +2,7 @@
* #START_LICENSE#
* smp-webapp
* %%
- * Copyright (C) 2017 - 2023 European Commission | eDelivery | DomiSMP
+ * Copyright (C) 2017 - 2024 European Commission | eDelivery | DomiSMP
* %%
* Licensed under the EUPL, Version 1.2 or – as soon they will be approved by the European Commission - subsequent
* versions of the EUPL (the "Licence");
diff --git a/smp-server-library/src/test/java/eu/europa/ec/edelivery/smp/sml/SmlClientFactoryAuthenticationByClientCertHttpHeader.java b/smp-server-library/src/test/java/eu/europa/ec/edelivery/smp/sml/SmlClientFactoryAuthenticationByClientCertHttpHeader.java
index 0e14b35ea07e678fe423767d4fde8c025df94879..2f5a8346071164ba26eea0e14af50246f52075c3 100644
--- a/smp-server-library/src/test/java/eu/europa/ec/edelivery/smp/sml/SmlClientFactoryAuthenticationByClientCertHttpHeader.java
+++ b/smp-server-library/src/test/java/eu/europa/ec/edelivery/smp/sml/SmlClientFactoryAuthenticationByClientCertHttpHeader.java
@@ -2,7 +2,7 @@
* #START_LICENSE#
* smp-webapp
* %%
- * Copyright (C) 2017 - 2023 European Commission | eDelivery | DomiSMP
+ * Copyright (C) 2017 - 2024 European Commission | eDelivery | DomiSMP
* %%
* Licensed under the EUPL, Version 1.2 or – as soon they will be approved by the European Commission - subsequent
* versions of the EUPL (the "Licence");
diff --git a/smp-server-library/src/test/java/eu/europa/ec/edelivery/smp/sml/SmlConnectorDomainTest.java b/smp-server-library/src/test/java/eu/europa/ec/edelivery/smp/sml/SmlConnectorDomainTest.java
index 075345d5101da6a04b016aa15321e6e25add1843..38da26bbfc319a2c2ffa200d8ff649a1fdbee655 100644
--- a/smp-server-library/src/test/java/eu/europa/ec/edelivery/smp/sml/SmlConnectorDomainTest.java
+++ b/smp-server-library/src/test/java/eu/europa/ec/edelivery/smp/sml/SmlConnectorDomainTest.java
@@ -3,7 +3,7 @@
* #START_LICENSE#
* smp-webapp
* %%
- * Copyright (C) 2017 - 2023 European Commission | eDelivery | DomiSMP
+ * Copyright (C) 2017 - 2024 European Commission | eDelivery | DomiSMP
* %%
* Licensed under the EUPL, Version 1.2 or – as soon they will be approved by the European Commission - subsequent
* versions of the EUPL (the "Licence");
diff --git a/smp-server-library/src/test/java/eu/europa/ec/edelivery/smp/sml/SmlConnectorParticipantTest.java b/smp-server-library/src/test/java/eu/europa/ec/edelivery/smp/sml/SmlConnectorParticipantTest.java
index 55094a219f21ea6f134e9983cd793c5ba4b2ad94..5c911a6b4f326779f5eed3ff3cc9d48a88c12a9e 100644
--- a/smp-server-library/src/test/java/eu/europa/ec/edelivery/smp/sml/SmlConnectorParticipantTest.java
+++ b/smp-server-library/src/test/java/eu/europa/ec/edelivery/smp/sml/SmlConnectorParticipantTest.java
@@ -2,7 +2,7 @@
* #START_LICENSE#
* smp-webapp
* %%
- * Copyright (C) 2017 - 2023 European Commission | eDelivery | DomiSMP
+ * Copyright (C) 2017 - 2024 European Commission | eDelivery | DomiSMP
* %%
* Licensed under the EUPL, Version 1.2 or – as soon they will be approved by the European Commission - subsequent
* versions of the EUPL (the "Licence");
@@ -44,8 +44,7 @@ import static eu.europa.ec.edelivery.smp.sml.SmlConnectorTestConstants.*;
import static org.hamcrest.CoreMatchers.containsString;
import static org.hamcrest.MatcherAssert.assertThat;
import static org.junit.jupiter.api.Assertions.*;
-import static org.mockito.ArgumentMatchers.any;
-import static org.mockito.ArgumentMatchers.anyString;
+import static org.mockito.ArgumentMatchers.*;
import static org.mockito.Mockito.*;
/**
@@ -251,7 +250,7 @@ class SmlConnectorParticipantTest extends AbstractServiceIntegrationTest {
NotFoundFault ex = new NotFoundFault(ERROR_PI_NO_EXISTS);
//when
- testInstance.processSMLErrorMessage(ex, PARTICIPANT_ID);
+ assertDoesNotThrow(() -> testInstance.processSMLErrorMessage(ex, PARTICIPANT_ID));
}
@Test
diff --git a/smp-server-library/src/test/java/eu/europa/ec/edelivery/smp/sml/SmlConnectorTestConstants.java b/smp-server-library/src/test/java/eu/europa/ec/edelivery/smp/sml/SmlConnectorTestConstants.java
index db7eff812775224351f840fc863b4f9c2549621f..06cd97cce603a4571f175c31c3a2194e6c666919 100644
--- a/smp-server-library/src/test/java/eu/europa/ec/edelivery/smp/sml/SmlConnectorTestConstants.java
+++ b/smp-server-library/src/test/java/eu/europa/ec/edelivery/smp/sml/SmlConnectorTestConstants.java
@@ -2,7 +2,7 @@
* #START_LICENSE#
* smp-server-library
* %%
- * Copyright (C) 2017 - 2023 European Commission | eDelivery | DomiSMP
+ * Copyright (C) 2017 - 2024 European Commission | eDelivery | DomiSMP
* %%
* Licensed under the EUPL, Version 1.2 or – as soon they will be approved by the European Commission - subsequent
* versions of the EUPL (the "Licence");
diff --git a/smp-server-library/src/test/java/eu/europa/ec/edelivery/smp/testutil/DBAssertion.java b/smp-server-library/src/test/java/eu/europa/ec/edelivery/smp/testutil/DBAssertion.java
index f441c8d6405b3320b5c06610fe0e677afc653a69..23e7fc4966c1a7c91ec7670685eb5e2c9c6fe0e4 100644
--- a/smp-server-library/src/test/java/eu/europa/ec/edelivery/smp/testutil/DBAssertion.java
+++ b/smp-server-library/src/test/java/eu/europa/ec/edelivery/smp/testutil/DBAssertion.java
@@ -2,7 +2,7 @@
* #START_LICENSE#
* smp-server-library
* %%
- * Copyright (C) 2017 - 2023 European Commission | eDelivery | DomiSMP
+ * Copyright (C) 2017 - 2024 European Commission | eDelivery | DomiSMP
* %%
* Licensed under the EUPL, Version 1.2 or – as soon they will be approved by the European Commission - subsequent
* versions of the EUPL (the "Licence");
diff --git a/smp-server-library/src/test/java/eu/europa/ec/edelivery/smp/testutil/MockAlertBeans.java b/smp-server-library/src/test/java/eu/europa/ec/edelivery/smp/testutil/MockAlertBeans.java
index f853796dbb634a0a54ad7155e5c8b046887343cd..5e017cfb0b81d965dba656d5c66b1ef187c14f9f 100644
--- a/smp-server-library/src/test/java/eu/europa/ec/edelivery/smp/testutil/MockAlertBeans.java
+++ b/smp-server-library/src/test/java/eu/europa/ec/edelivery/smp/testutil/MockAlertBeans.java
@@ -2,7 +2,7 @@
* #START_LICENSE#
* smp-server-library
* %%
- * Copyright (C) 2017 - 2023 European Commission | eDelivery | DomiSMP
+ * Copyright (C) 2017 - 2024 European Commission | eDelivery | DomiSMP
* %%
* Licensed under the EUPL, Version 1.2 or – as soon they will be approved by the European Commission - subsequent
* versions of the EUPL (the "Licence");
diff --git a/smp-server-library/src/test/java/eu/europa/ec/edelivery/smp/testutil/SMPAssert.java b/smp-server-library/src/test/java/eu/europa/ec/edelivery/smp/testutil/SMPAssert.java
index b0178956f726fae5c49ab177888d9d9b503775db..d7d194ee98401e4622559e9a0f2ff11090bd8420 100644
--- a/smp-server-library/src/test/java/eu/europa/ec/edelivery/smp/testutil/SMPAssert.java
+++ b/smp-server-library/src/test/java/eu/europa/ec/edelivery/smp/testutil/SMPAssert.java
@@ -2,7 +2,7 @@
* #START_LICENSE#
* smp-server-library
* %%
- * Copyright (C) 2017 - 2023 European Commission | eDelivery | DomiSMP
+ * Copyright (C) 2017 - 2024 European Commission | eDelivery | DomiSMP
* %%
* Licensed under the EUPL, Version 1.2 or – as soon they will be approved by the European Commission - subsequent
* versions of the EUPL (the "Licence");
diff --git a/smp-server-library/src/test/java/eu/europa/ec/edelivery/smp/testutil/SignatureUtil.java b/smp-server-library/src/test/java/eu/europa/ec/edelivery/smp/testutil/SignatureUtil.java
index 96d0486997b915c8ddf000d4b0ccebe399909b9d..22b78aac6053d43666ecc9a5a5bc320e33d0f6bf 100644
--- a/smp-server-library/src/test/java/eu/europa/ec/edelivery/smp/testutil/SignatureUtil.java
+++ b/smp-server-library/src/test/java/eu/europa/ec/edelivery/smp/testutil/SignatureUtil.java
@@ -2,7 +2,7 @@
* #START_LICENSE#
* smp-webapp
* %%
- * Copyright (C) 2017 - 2023 European Commission | eDelivery | DomiSMP
+ * Copyright (C) 2017 - 2024 European Commission | eDelivery | DomiSMP
* %%
* Licensed under the EUPL, Version 1.2 or – as soon they will be approved by the European Commission - subsequent
* versions of the EUPL (the "Licence");
diff --git a/smp-server-library/src/test/java/eu/europa/ec/edelivery/smp/testutil/TestConstants.java b/smp-server-library/src/test/java/eu/europa/ec/edelivery/smp/testutil/TestConstants.java
index c93a83fee0af1ea3a5123b18e597b9a4638bb6f0..4693eeee01d1c25e55d42b04acdd7afd3bcd887e 100644
--- a/smp-server-library/src/test/java/eu/europa/ec/edelivery/smp/testutil/TestConstants.java
+++ b/smp-server-library/src/test/java/eu/europa/ec/edelivery/smp/testutil/TestConstants.java
@@ -2,7 +2,7 @@
* #START_LICENSE#
* smp-server-library
* %%
- * Copyright (C) 2017 - 2023 European Commission | eDelivery | DomiSMP
+ * Copyright (C) 2017 - 2024 European Commission | eDelivery | DomiSMP
* %%
* Licensed under the EUPL, Version 1.2 or – as soon they will be approved by the European Commission - subsequent
* versions of the EUPL (the "Licence");
diff --git a/smp-server-library/src/test/java/eu/europa/ec/edelivery/smp/testutil/TestDBUtils.java b/smp-server-library/src/test/java/eu/europa/ec/edelivery/smp/testutil/TestDBUtils.java
index 13f490aac2f0ee6df79c88662ecc8598d86d6c2c..b607edaa84485683969998de5ba485051ebe2046 100644
--- a/smp-server-library/src/test/java/eu/europa/ec/edelivery/smp/testutil/TestDBUtils.java
+++ b/smp-server-library/src/test/java/eu/europa/ec/edelivery/smp/testutil/TestDBUtils.java
@@ -2,7 +2,7 @@
* #START_LICENSE#
* smp-server-library
* %%
- * Copyright (C) 2017 - 2023 European Commission | eDelivery | DomiSMP
+ * Copyright (C) 2017 - 2024 European Commission | eDelivery | DomiSMP
* %%
* Licensed under the EUPL, Version 1.2 or – as soon they will be approved by the European Commission - subsequent
* versions of the EUPL (the "Licence");
diff --git a/smp-server-library/src/test/java/eu/europa/ec/edelivery/smp/testutil/TestROUtils.java b/smp-server-library/src/test/java/eu/europa/ec/edelivery/smp/testutil/TestROUtils.java
index c524f91611a46fe455e7bb049f229795facf58aa..487ad7f6d47e64209c174779b015b6c57cad3399 100644
--- a/smp-server-library/src/test/java/eu/europa/ec/edelivery/smp/testutil/TestROUtils.java
+++ b/smp-server-library/src/test/java/eu/europa/ec/edelivery/smp/testutil/TestROUtils.java
@@ -2,7 +2,7 @@
* #START_LICENSE#
* smp-server-library
* %%
- * Copyright (C) 2017 - 2023 European Commission | eDelivery | DomiSMP
+ * Copyright (C) 2017 - 2024 European Commission | eDelivery | DomiSMP
* %%
* Licensed under the EUPL, Version 1.2 or – as soon they will be approved by the European Commission - subsequent
* versions of the EUPL (the "Licence");
diff --git a/smp-server-library/src/test/java/eu/europa/ec/edelivery/smp/testutil/X509CertificateTestUtils.java b/smp-server-library/src/test/java/eu/europa/ec/edelivery/smp/testutil/X509CertificateTestUtils.java
index f74840d3ff9603d403c938de84238196527e0faf..86f3954e85d6fd2de2745d52f5b6426a46982e58 100644
--- a/smp-server-library/src/test/java/eu/europa/ec/edelivery/smp/testutil/X509CertificateTestUtils.java
+++ b/smp-server-library/src/test/java/eu/europa/ec/edelivery/smp/testutil/X509CertificateTestUtils.java
@@ -2,7 +2,7 @@
* #START_LICENSE#
* smp-server-library
* %%
- * Copyright (C) 2017 - 2023 European Commission | eDelivery | DomiSMP
+ * Copyright (C) 2017 - 2024 European Commission | eDelivery | DomiSMP
* %%
* Licensed under the EUPL, Version 1.2 or – as soon they will be approved by the European Commission - subsequent
* versions of the EUPL (the "Licence");
diff --git a/smp-server-library/src/test/java/eu/europa/ec/edelivery/smp/testutil/X509KeySelector.java b/smp-server-library/src/test/java/eu/europa/ec/edelivery/smp/testutil/X509KeySelector.java
index 8164445246ffe31e1f5c12e83f675175ea2b2952..753553aa9aa3e884de3dead28d933fb7ef103db3 100644
--- a/smp-server-library/src/test/java/eu/europa/ec/edelivery/smp/testutil/X509KeySelector.java
+++ b/smp-server-library/src/test/java/eu/europa/ec/edelivery/smp/testutil/X509KeySelector.java
@@ -2,7 +2,7 @@
* #START_LICENSE#
* smp-webapp
* %%
- * Copyright (C) 2017 - 2023 European Commission | eDelivery | DomiSMP
+ * Copyright (C) 2017 - 2024 European Commission | eDelivery | DomiSMP
* %%
* Licensed under the EUPL, Version 1.2 or – as soon they will be approved by the European Commission - subsequent
* versions of the EUPL (the "Licence");
diff --git a/smp-server-library/src/test/java/eu/europa/ec/edelivery/smp/testutil/params/VariableArgumentsProvider.java b/smp-server-library/src/test/java/eu/europa/ec/edelivery/smp/testutil/params/VariableArgumentsProvider.java
index 9e4f8211ab81b9c4aa10314e799576d2a3c87016..e2bda8125544bc10a67996b276ee6a4f5ed30965 100644
--- a/smp-server-library/src/test/java/eu/europa/ec/edelivery/smp/testutil/params/VariableArgumentsProvider.java
+++ b/smp-server-library/src/test/java/eu/europa/ec/edelivery/smp/testutil/params/VariableArgumentsProvider.java
@@ -2,7 +2,7 @@
* #START_LICENSE#
* smp-server-library
* %%
- * Copyright (C) 2017 - 2023 European Commission | eDelivery | DomiSMP
+ * Copyright (C) 2017 - 2024 European Commission | eDelivery | DomiSMP
* %%
* Licensed under the EUPL, Version 1.2 or – as soon they will be approved by the European Commission - subsequent
* versions of the EUPL (the "Licence");
diff --git a/smp-server-library/src/test/java/eu/europa/ec/edelivery/smp/testutil/params/VariableSource.java b/smp-server-library/src/test/java/eu/europa/ec/edelivery/smp/testutil/params/VariableSource.java
index 9407b3d4db6bd6a31205719a2f2bd54ead5fbd35..5183aff33296d939ff31509c844dd50681a62ff0 100644
--- a/smp-server-library/src/test/java/eu/europa/ec/edelivery/smp/testutil/params/VariableSource.java
+++ b/smp-server-library/src/test/java/eu/europa/ec/edelivery/smp/testutil/params/VariableSource.java
@@ -2,7 +2,7 @@
* #START_LICENSE#
* smp-server-library
* %%
- * Copyright (C) 2017 - 2023 European Commission | eDelivery | DomiSMP
+ * Copyright (C) 2017 - 2024 European Commission | eDelivery | DomiSMP
* %%
* Licensed under the EUPL, Version 1.2 or – as soon they will be approved by the European Commission - subsequent
* versions of the EUPL (the "Licence");
diff --git a/smp-server-library/src/test/java/eu/europa/ec/edelivery/smp/utils/BCryptPasswordHashTest.java b/smp-server-library/src/test/java/eu/europa/ec/edelivery/smp/utils/BCryptPasswordHashTest.java
index dd38176a2dfaa6aeacde0b1868531a04b87c6f8c..62365ea98e68f12b88747db698914701c5ea6d73 100644
--- a/smp-server-library/src/test/java/eu/europa/ec/edelivery/smp/utils/BCryptPasswordHashTest.java
+++ b/smp-server-library/src/test/java/eu/europa/ec/edelivery/smp/utils/BCryptPasswordHashTest.java
@@ -2,7 +2,7 @@
* #START_LICENSE#
* smp-webapp
* %%
- * Copyright (C) 2017 - 2023 European Commission | eDelivery | DomiSMP
+ * Copyright (C) 2017 - 2024 European Commission | eDelivery | DomiSMP
* %%
* Licensed under the EUPL, Version 1.2 or – as soon they will be approved by the European Commission - subsequent
* versions of the EUPL (the "Licence");
diff --git a/smp-server-library/src/test/java/eu/europa/ec/edelivery/smp/utils/ExtLibraryClassLoaderTest.java b/smp-server-library/src/test/java/eu/europa/ec/edelivery/smp/utils/ExtLibraryClassLoaderTest.java
index 234069bf8da287e6d9fe893938880411880bdd13..a3ca23070621cc361a98c392c19c87154179621d 100644
--- a/smp-server-library/src/test/java/eu/europa/ec/edelivery/smp/utils/ExtLibraryClassLoaderTest.java
+++ b/smp-server-library/src/test/java/eu/europa/ec/edelivery/smp/utils/ExtLibraryClassLoaderTest.java
@@ -2,7 +2,7 @@
* #START_LICENSE#
* smp-server-library
* %%
- * Copyright (C) 2017 - 2023 European Commission | eDelivery | DomiSMP
+ * Copyright (C) 2017 - 2024 European Commission | eDelivery | DomiSMP
* %%
* Licensed under the EUPL, Version 1.2 or – as soon they will be approved by the European Commission - subsequent
* versions of the EUPL (the "Licence");
diff --git a/smp-server-library/src/test/java/eu/europa/ec/edelivery/smp/utils/HttpForwardedHeadersTest.java b/smp-server-library/src/test/java/eu/europa/ec/edelivery/smp/utils/HttpForwardedHeadersTest.java
index 0ba735ddc75a2b95ecac37b1944b08b29aca991c..8502ebd4b2eae480bea148bfe96e5aea80ccefc0 100644
--- a/smp-server-library/src/test/java/eu/europa/ec/edelivery/smp/utils/HttpForwardedHeadersTest.java
+++ b/smp-server-library/src/test/java/eu/europa/ec/edelivery/smp/utils/HttpForwardedHeadersTest.java
@@ -2,7 +2,7 @@
* #START_LICENSE#
* smp-server-library
* %%
- * Copyright (C) 2017 - 2023 European Commission | eDelivery | DomiSMP
+ * Copyright (C) 2017 - 2024 European Commission | eDelivery | DomiSMP
* %%
* Licensed under the EUPL, Version 1.2 or – as soon they will be approved by the European Commission - subsequent
* versions of the EUPL (the "Licence");
@@ -18,7 +18,6 @@
*/
package eu.europa.ec.edelivery.smp.utils;
-import org.junit.jupiter.api.Assertions;
import org.junit.jupiter.params.ParameterizedTest;
import org.junit.jupiter.params.provider.MethodSource;
import org.mockito.Mockito;
diff --git a/smp-server-library/src/test/java/eu/europa/ec/edelivery/smp/utils/HttpUtilsTest.java b/smp-server-library/src/test/java/eu/europa/ec/edelivery/smp/utils/HttpUtilsTest.java
index 19f4202b16cbe8a2557f6954e069c0e003e48b46..35d703cb2eb06b297801516df67d285d777f5428 100644
--- a/smp-server-library/src/test/java/eu/europa/ec/edelivery/smp/utils/HttpUtilsTest.java
+++ b/smp-server-library/src/test/java/eu/europa/ec/edelivery/smp/utils/HttpUtilsTest.java
@@ -2,7 +2,7 @@
* #START_LICENSE#
* smp-server-library
* %%
- * Copyright (C) 2017 - 2023 European Commission | eDelivery | DomiSMP
+ * Copyright (C) 2017 - 2024 European Commission | eDelivery | DomiSMP
* %%
* Licensed under the EUPL, Version 1.2 or – as soon they will be approved by the European Commission - subsequent
* versions of the EUPL (the "Licence");
diff --git a/smp-server-library/src/test/java/eu/europa/ec/edelivery/smp/utils/PropertyUtilsTest.java b/smp-server-library/src/test/java/eu/europa/ec/edelivery/smp/utils/PropertyUtilsTest.java
index 8a3c7af3676b7e6526bb38ef478d6a54164e5d27..52f7a335b64576a63b0433f64b9c91039ca2a406 100644
--- a/smp-server-library/src/test/java/eu/europa/ec/edelivery/smp/utils/PropertyUtilsTest.java
+++ b/smp-server-library/src/test/java/eu/europa/ec/edelivery/smp/utils/PropertyUtilsTest.java
@@ -2,7 +2,7 @@
* #START_LICENSE#
* smp-server-library
* %%
- * Copyright (C) 2017 - 2023 European Commission | eDelivery | DomiSMP
+ * Copyright (C) 2017 - 2024 European Commission | eDelivery | DomiSMP
* %%
* Licensed under the EUPL, Version 1.2 or – as soon they will be approved by the European Commission - subsequent
* versions of the EUPL (the "Licence");
diff --git a/smp-server-library/src/test/java/eu/europa/ec/edelivery/smp/utils/SMPCookieWriterGenerateHeaderTest.java b/smp-server-library/src/test/java/eu/europa/ec/edelivery/smp/utils/SMPCookieWriterGenerateHeaderTest.java
index 2649b86c02400dcb6d33cf03f95ad8a547d5a431..2aebbfcb2bf60c9840fd68abdc90dd55b99ee611 100644
--- a/smp-server-library/src/test/java/eu/europa/ec/edelivery/smp/utils/SMPCookieWriterGenerateHeaderTest.java
+++ b/smp-server-library/src/test/java/eu/europa/ec/edelivery/smp/utils/SMPCookieWriterGenerateHeaderTest.java
@@ -2,7 +2,7 @@
* #START_LICENSE#
* smp-server-library
* %%
- * Copyright (C) 2017 - 2023 European Commission | eDelivery | DomiSMP
+ * Copyright (C) 2017 - 2024 European Commission | eDelivery | DomiSMP
* %%
* Licensed under the EUPL, Version 1.2 or – as soon they will be approved by the European Commission - subsequent
* versions of the EUPL (the "Licence");
diff --git a/smp-server-library/src/test/java/eu/europa/ec/edelivery/smp/utils/SMPCookieWriterTest.java b/smp-server-library/src/test/java/eu/europa/ec/edelivery/smp/utils/SMPCookieWriterTest.java
index fd5ca27c0a4484e6e942572d034e235192148a3c..14f44939bb4b884f260da3c537603faecc154ac3 100644
--- a/smp-server-library/src/test/java/eu/europa/ec/edelivery/smp/utils/SMPCookieWriterTest.java
+++ b/smp-server-library/src/test/java/eu/europa/ec/edelivery/smp/utils/SMPCookieWriterTest.java
@@ -2,7 +2,7 @@
* #START_LICENSE#
* smp-server-library
* %%
- * Copyright (C) 2017 - 2023 European Commission | eDelivery | DomiSMP
+ * Copyright (C) 2017 - 2024 European Commission | eDelivery | DomiSMP
* %%
* Licensed under the EUPL, Version 1.2 or – as soon they will be approved by the European Commission - subsequent
* versions of the EUPL (the "Licence");
diff --git a/smp-server-library/src/test/java/eu/europa/ec/edelivery/smp/utils/SessionSecurityUtilsTest.java b/smp-server-library/src/test/java/eu/europa/ec/edelivery/smp/utils/SessionSecurityUtilsTest.java
index 518c217cb698b7a46add6dfb8efe764ef812f305..8590fa90b963f90f5044fdcb708b92d58106455c 100644
--- a/smp-server-library/src/test/java/eu/europa/ec/edelivery/smp/utils/SessionSecurityUtilsTest.java
+++ b/smp-server-library/src/test/java/eu/europa/ec/edelivery/smp/utils/SessionSecurityUtilsTest.java
@@ -2,7 +2,7 @@
* #START_LICENSE#
* smp-server-library
* %%
- * Copyright (C) 2017 - 2023 European Commission | eDelivery | DomiSMP
+ * Copyright (C) 2017 - 2024 European Commission | eDelivery | DomiSMP
* %%
* Licensed under the EUPL, Version 1.2 or – as soon they will be approved by the European Commission - subsequent
* versions of the EUPL (the "Licence");
diff --git a/smp-server-library/src/test/java/eu/europa/ec/edelivery/smp/utils/StringNamedSubstitutorTest.java b/smp-server-library/src/test/java/eu/europa/ec/edelivery/smp/utils/StringNamedSubstitutorTest.java
index c96a88887c7fadc5101ad538ea18f42c6402e0a3..8076ad8b77e08b3c5067880ebd91854acefe5d42 100644
--- a/smp-server-library/src/test/java/eu/europa/ec/edelivery/smp/utils/StringNamedSubstitutorTest.java
+++ b/smp-server-library/src/test/java/eu/europa/ec/edelivery/smp/utils/StringNamedSubstitutorTest.java
@@ -2,7 +2,7 @@
* #START_LICENSE#
* smp-server-library
* %%
- * Copyright (C) 2017 - 2023 European Commission | eDelivery | DomiSMP
+ * Copyright (C) 2017 - 2024 European Commission | eDelivery | DomiSMP
* %%
* Licensed under the EUPL, Version 1.2 or – as soon they will be approved by the European Commission - subsequent
* versions of the EUPL (the "Licence");
diff --git a/smp-server-library/src/test/java/eu/europa/ec/edelivery/smp/utils/X509CertificateUtilsTest.java b/smp-server-library/src/test/java/eu/europa/ec/edelivery/smp/utils/X509CertificateUtilsTest.java
index 498026b6ee0a7f1802324cfdba49e1b727e69d6b..c72480438de3617129bf26a7cefe4929f1c1d6d3 100644
--- a/smp-server-library/src/test/java/eu/europa/ec/edelivery/smp/utils/X509CertificateUtilsTest.java
+++ b/smp-server-library/src/test/java/eu/europa/ec/edelivery/smp/utils/X509CertificateUtilsTest.java
@@ -2,7 +2,7 @@
* #START_LICENSE#
* smp-server-library
* %%
- * Copyright (C) 2017 - 2023 European Commission | eDelivery | DomiSMP
+ * Copyright (C) 2017 - 2024 European Commission | eDelivery | DomiSMP
* %%
* Licensed under the EUPL, Version 1.2 or – as soon they will be approved by the European Commission - subsequent
* versions of the EUPL (the "Licence");
@@ -16,21 +16,6 @@
* See the Licence for the specific language governing permissions and limitations under the Licence.
* #END_LICENSE#
*/
-/**
- * Copyright 2017 - European Commission | CEF eDelivery
- * <p>
- * Licensed under the EUPL, Version 1.2 (the "License");
- * You may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * <p>
- * \BDMSL\bdmsl-parent-pom\LICENSE-EUPL-v1.2.pdf or https://joinup.ec.europa.eu/sites/default/files/custom-page/attachment/eupl_v1.2_en.pdf
- * <p>
- * 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 eu.europa.ec.edelivery.smp.utils;
@@ -66,7 +51,7 @@ public class X509CertificateUtilsTest {
Security.addProvider(new org.bouncycastle.jce.provider.BouncyCastleProvider());
}
- private static final Object[] crlTestListCases() {
+ private static Object[] crlTestListCases() {
return new Object[][]{
{"smp-crl-test-all.pem", "https://localhost/clr,http://localhost/clr,ldap://localhost/clr"},
{"smp-crl-test-https.pem", "https://localhost/clr"},
@@ -75,7 +60,7 @@ public class X509CertificateUtilsTest {
};
}
- private static final Object[] crlExtractHTTPSTestListCases() {
+ private static Object[] crlExtractHTTPSTestListCases() {
return new Object[][]{
{"ldap://localhost/clr,https://localhost/clr,http://localhost/clr", "https://localhost/clr"},
{"https://localhost/clr", "https://localhost/clr"},
@@ -85,7 +70,7 @@ public class X509CertificateUtilsTest {
};
}
- private static final Object[] parseTestCases() {
+ private static Object[] parseTestCases() {
return new Object[][]{
{"certificate-pem-with-header.cer"},
{"PeppolTestSMP-DER-encoded.crt"},
@@ -116,9 +101,7 @@ public class X509CertificateUtilsTest {
List<String> lstValues = X509CertificateUtils.getCrlDistributionPoints(certificate);
// then
assertEquals(lstExpected.size(), lstValues.size());
- lstValues.forEach(crl -> {
- lstExpected.contains(crl);
- });
+ lstValues.forEach(crl -> lstExpected.contains(crl));
}
@ParameterizedTest
@@ -135,12 +118,11 @@ public class X509CertificateUtilsTest {
public static X509Certificate loadCertificate(String filename) throws CertificateException {
CertificateFactory fact = CertificateFactory.getInstance("X.509");
- X509Certificate cer = (X509Certificate)
- fact.generateCertificate(X509CertificateUtilsTest.class.getResourceAsStream("/certificates/" + filename));
- return cer;
+ return (X509Certificate) fact.generateCertificate(
+ X509CertificateUtilsTest.class.getResourceAsStream("/certificates/" + filename));
}
- public static byte[] getBytes(String filename) throws CertificateException, IOException {
+ public static byte[] getBytes(String filename) throws IOException {
return IOUtils.toByteArray(X509CertificateUtilsTest.class.getResourceAsStream("/certificates/" + filename));
}
}
diff --git a/smp-server-library/src/test/resources/config.properties b/smp-server-library/src/test/resources/config.properties
index 78817451b4601f9f2963d58ad0c2203a01cd4ec2..fd5ad5d40523a7300e973b9b6192186e0cda63da 100644
--- a/smp-server-library/src/test/resources/config.properties
+++ b/smp-server-library/src/test/resources/config.properties
@@ -2,7 +2,7 @@
# #START_LICENSE#
# smp-server-library
# %%
-# Copyright (C) 2017 - 2023 European Commission | eDelivery | DomiSMP
+# Copyright (C) 2017 - 2024 European Commission | eDelivery | DomiSMP
# %%
# Licensed under the EUPL, Version 1.2 or – as soon they will be approved by the European Commission - subsequent
# versions of the EUPL (the "Licence");
diff --git a/smp-server-library/src/test/resources/examples/oasis-smp-1.0/ServiceGroupOK.xml b/smp-server-library/src/test/resources/examples/oasis-smp-1.0/ServiceGroupOK.xml
index 19716332c062110024fbd9f07b6f0d091424ff25..530cd3e1ea0bd39461e6be541c58596fa9ceb763 100644
--- a/smp-server-library/src/test/resources/examples/oasis-smp-1.0/ServiceGroupOK.xml
+++ b/smp-server-library/src/test/resources/examples/oasis-smp-1.0/ServiceGroupOK.xml
@@ -3,7 +3,7 @@
#START_LICENSE#
smp-server-library
%%
- Copyright (C) 2017 - 2023 European Commission | eDelivery | DomiSMP
+ Copyright (C) 2017 - 2024 European Commission | eDelivery | DomiSMP
%%
Licensed under the EUPL, Version 1.2 or – as soon they will be approved by the European Commission - subsequent
versions of the EUPL (the "Licence");
diff --git a/smp-server-library/src/test/resources/examples/oasis-smp-1.0/ServiceMetadataOK.xml b/smp-server-library/src/test/resources/examples/oasis-smp-1.0/ServiceMetadataOK.xml
index 689e3e17e3ded14ba77aa12f1d838f6f7e8d6188..7dc34bc48fa99b44ad37fa7cb3c23a55ef90d227 100644
--- a/smp-server-library/src/test/resources/examples/oasis-smp-1.0/ServiceMetadataOK.xml
+++ b/smp-server-library/src/test/resources/examples/oasis-smp-1.0/ServiceMetadataOK.xml
@@ -3,7 +3,7 @@
#START_LICENSE#
smp-server-library
%%
- Copyright (C) 2017 - 2023 European Commission | eDelivery | DomiSMP
+ Copyright (C) 2017 - 2024 European Commission | eDelivery | DomiSMP
%%
Licensed under the EUPL, Version 1.2 or – as soon they will be approved by the European Commission - subsequent
versions of the EUPL (the "Licence");
diff --git a/smp-server-library/src/test/resources/examples/services/ServiceGroupPoland.xml b/smp-server-library/src/test/resources/examples/services/ServiceGroupPoland.xml
index 6da6558e0ad6da9db183f9d5cd56c328900e06f3..ac0996c6bd09e8040e69e70aba8d8f63d8f3e02f 100644
--- a/smp-server-library/src/test/resources/examples/services/ServiceGroupPoland.xml
+++ b/smp-server-library/src/test/resources/examples/services/ServiceGroupPoland.xml
@@ -3,7 +3,7 @@
#START_LICENSE#
smp-server-library
%%
- Copyright (C) 2017 - 2023 European Commission | eDelivery | DomiSMP
+ Copyright (C) 2017 - 2024 European Commission | eDelivery | DomiSMP
%%
Licensed under the EUPL, Version 1.2 or – as soon they will be approved by the European Commission - subsequent
versions of the EUPL (the "Licence");
diff --git a/smp-server-library/src/test/resources/examples/services/ServiceGroupTestSgId2.xml b/smp-server-library/src/test/resources/examples/services/ServiceGroupTestSgId2.xml
index 2979e9092f4941b8ba8ecc0bf22edf2e68cd0286..2d72e55ae48d1975d98dba24967000c673f015f9 100644
--- a/smp-server-library/src/test/resources/examples/services/ServiceGroupTestSgId2.xml
+++ b/smp-server-library/src/test/resources/examples/services/ServiceGroupTestSgId2.xml
@@ -3,7 +3,7 @@
#START_LICENSE#
smp-server-library
%%
- Copyright (C) 2017 - 2023 European Commission | eDelivery | DomiSMP
+ Copyright (C) 2017 - 2024 European Commission | eDelivery | DomiSMP
%%
Licensed under the EUPL, Version 1.2 or – as soon they will be approved by the European Commission - subsequent
versions of the EUPL (the "Licence");
diff --git a/smp-server-library/src/test/resources/examples/services/ServiceMetadataDifferentCertificatesTypes.xml b/smp-server-library/src/test/resources/examples/services/ServiceMetadataDifferentCertificatesTypes.xml
index 7480f3e2b98b232ab950c57a6d59f6a201d08d79..9392dd387214b283f7018658fa0fb0f22d8d2544 100644
--- a/smp-server-library/src/test/resources/examples/services/ServiceMetadataDifferentCertificatesTypes.xml
+++ b/smp-server-library/src/test/resources/examples/services/ServiceMetadataDifferentCertificatesTypes.xml
@@ -3,7 +3,7 @@
#START_LICENSE#
smp-server-library
%%
- Copyright (C) 2017 - 2023 European Commission | eDelivery | DomiSMP
+ Copyright (C) 2017 - 2024 European Commission | eDelivery | DomiSMP
%%
Licensed under the EUPL, Version 1.2 or – as soon they will be approved by the European Commission - subsequent
versions of the EUPL (the "Licence");
diff --git a/smp-server-library/src/test/resources/examples/services/ServiceMetadataPoland.xml b/smp-server-library/src/test/resources/examples/services/ServiceMetadataPoland.xml
index 1322ced450a1625e068de7488d7c1f5740584396..16543a3c669847c1a5111c5b1e3652a3283c848f 100644
--- a/smp-server-library/src/test/resources/examples/services/ServiceMetadataPoland.xml
+++ b/smp-server-library/src/test/resources/examples/services/ServiceMetadataPoland.xml
@@ -3,7 +3,7 @@
#START_LICENSE#
smp-server-library
%%
- Copyright (C) 2017 - 2023 European Commission | eDelivery | DomiSMP
+ Copyright (C) 2017 - 2024 European Commission | eDelivery | DomiSMP
%%
Licensed under the EUPL, Version 1.2 or – as soon they will be approved by the European Commission - subsequent
versions of the EUPL (the "Licence");
diff --git a/smp-server-library/src/test/resources/examples/services/SignedServiceMetadataPoland.xml b/smp-server-library/src/test/resources/examples/services/SignedServiceMetadataPoland.xml
index 88e31278a65665f63d380e7dac802ced17d6f8f1..fc0e0f5ed81f7a0ebc9fc759d3c2c9d186d07c9d 100644
--- a/smp-server-library/src/test/resources/examples/services/SignedServiceMetadataPoland.xml
+++ b/smp-server-library/src/test/resources/examples/services/SignedServiceMetadataPoland.xml
@@ -3,7 +3,7 @@
#START_LICENSE#
smp-server-library
%%
- Copyright (C) 2017 - 2023 European Commission | eDelivery | DomiSMP
+ Copyright (C) 2017 - 2024 European Commission | eDelivery | DomiSMP
%%
Licensed under the EUPL, Version 1.2 or – as soon they will be approved by the European Commission - subsequent
versions of the EUPL (the "Licence");
diff --git a/smp-server-library/src/test/resources/expected_output/GET_SignedServiceMetadata_response.xml b/smp-server-library/src/test/resources/expected_output/GET_SignedServiceMetadata_response.xml
index d62cb44efcd78ea6e489c6b50e6ae411939c3f39..8bb59f84d8281b95dcf3c1489845e219f9f9a8d1 100644
--- a/smp-server-library/src/test/resources/expected_output/GET_SignedServiceMetadata_response.xml
+++ b/smp-server-library/src/test/resources/expected_output/GET_SignedServiceMetadata_response.xml
@@ -3,7 +3,7 @@
#START_LICENSE#
smp-server-library
%%
- Copyright (C) 2017 - 2023 European Commission | eDelivery | DomiSMP
+ Copyright (C) 2017 - 2024 European Commission | eDelivery | DomiSMP
%%
Licensed under the EUPL, Version 1.2 or – as soon they will be approved by the European Commission - subsequent
versions of the EUPL (the "Licence");
diff --git a/smp-server-library/src/test/resources/expected_output/GET_SignedServiceMetadata_response_linarized.xml b/smp-server-library/src/test/resources/expected_output/GET_SignedServiceMetadata_response_linarized.xml
index c51e3bdec936b03a1651184a8000b0e906f09b3f..e5b6aab0d4b99961ce76c31fdbb860e0ac5bcefc 100644
--- a/smp-server-library/src/test/resources/expected_output/GET_SignedServiceMetadata_response_linarized.xml
+++ b/smp-server-library/src/test/resources/expected_output/GET_SignedServiceMetadata_response_linarized.xml
@@ -3,7 +3,7 @@
#START_LICENSE#
smp-server-library
%%
- Copyright (C) 2017 - 2023 European Commission | eDelivery | DomiSMP
+ Copyright (C) 2017 - 2024 European Commission | eDelivery | DomiSMP
%%
Licensed under the EUPL, Version 1.2 or – as soon they will be approved by the European Commission - subsequent
versions of the EUPL (the "Licence");
diff --git a/smp-server-library/src/test/resources/expected_output/PUT_ServiceMetadata_request.xml b/smp-server-library/src/test/resources/expected_output/PUT_ServiceMetadata_request.xml
index 46abea6741b2516ac863d270df5af342f6928ba6..237e25b5c7834b956d336df2aca70f72bd19f53d 100644
--- a/smp-server-library/src/test/resources/expected_output/PUT_ServiceMetadata_request.xml
+++ b/smp-server-library/src/test/resources/expected_output/PUT_ServiceMetadata_request.xml
@@ -3,7 +3,7 @@
#START_LICENSE#
smp-server-library
%%
- Copyright (C) 2017 - 2023 European Commission | eDelivery | DomiSMP
+ Copyright (C) 2017 - 2024 European Commission | eDelivery | DomiSMP
%%
Licensed under the EUPL, Version 1.2 or – as soon they will be approved by the European Commission - subsequent
versions of the EUPL (the "Licence");
diff --git a/smp-server-library/src/test/resources/expected_output/PUT_ServiceMetadata_request_linarized.xml b/smp-server-library/src/test/resources/expected_output/PUT_ServiceMetadata_request_linarized.xml
index ca6ce1e9911b9ba65df12917acf97fc2509b0a17..17deb6a52112e63200d058d9eae8ed354f3f34ba 100644
--- a/smp-server-library/src/test/resources/expected_output/PUT_ServiceMetadata_request_linarized.xml
+++ b/smp-server-library/src/test/resources/expected_output/PUT_ServiceMetadata_request_linarized.xml
@@ -3,7 +3,7 @@
#START_LICENSE#
smp-server-library
%%
- Copyright (C) 2017 - 2023 European Commission | eDelivery | DomiSMP
+ Copyright (C) 2017 - 2024 European Commission | eDelivery | DomiSMP
%%
Licensed under the EUPL, Version 1.2 or – as soon they will be approved by the European Commission - subsequent
versions of the EUPL (the "Licence");
diff --git a/smp-server-library/src/test/resources/expected_output/PUT_ServiceMetadata_request_not_valid.xml b/smp-server-library/src/test/resources/expected_output/PUT_ServiceMetadata_request_not_valid.xml
index 42f8ccf3ee66e5b02ae95a044cf4578b41d939e0..89ca6f32ea09b7efa9302615c31661a538e81d8b 100644
--- a/smp-server-library/src/test/resources/expected_output/PUT_ServiceMetadata_request_not_valid.xml
+++ b/smp-server-library/src/test/resources/expected_output/PUT_ServiceMetadata_request_not_valid.xml
@@ -3,7 +3,7 @@
#START_LICENSE#
smp-server-library
%%
- Copyright (C) 2017 - 2023 European Commission | eDelivery | DomiSMP
+ Copyright (C) 2017 - 2024 European Commission | eDelivery | DomiSMP
%%
Licensed under the EUPL, Version 1.2 or – as soon they will be approved by the European Commission - subsequent
versions of the EUPL (the "Licence");
diff --git a/smp-server-library/src/test/resources/expected_output/SignedServiceMetadata_invalid_customized_signature.xml b/smp-server-library/src/test/resources/expected_output/SignedServiceMetadata_invalid_customized_signature.xml
index b0ca80ab5cf5071cd3893230c63582ee6eb49370..5694cfe333a89d64518aa421bf22b8831ff08a85 100644
--- a/smp-server-library/src/test/resources/expected_output/SignedServiceMetadata_invalid_customized_signature.xml
+++ b/smp-server-library/src/test/resources/expected_output/SignedServiceMetadata_invalid_customized_signature.xml
@@ -3,7 +3,7 @@
#START_LICENSE#
smp-server-library
%%
- Copyright (C) 2017 - 2023 European Commission | eDelivery | DomiSMP
+ Copyright (C) 2017 - 2024 European Commission | eDelivery | DomiSMP
%%
Licensed under the EUPL, Version 1.2 or – as soon they will be approved by the European Commission - subsequent
versions of the EUPL (the "Licence");
diff --git a/smp-server-library/src/test/resources/expected_output/SignedServiceMetadata_invalid_default_signature.xml b/smp-server-library/src/test/resources/expected_output/SignedServiceMetadata_invalid_default_signature.xml
index 966d5f03ddab08c0fd9334a83a484472d0caf3d1..7869d843f5fc0fd2447f1f55832e015032d07321 100644
--- a/smp-server-library/src/test/resources/expected_output/SignedServiceMetadata_invalid_default_signature.xml
+++ b/smp-server-library/src/test/resources/expected_output/SignedServiceMetadata_invalid_default_signature.xml
@@ -3,7 +3,7 @@
#START_LICENSE#
smp-server-library
%%
- Copyright (C) 2017 - 2023 European Commission | eDelivery | DomiSMP
+ Copyright (C) 2017 - 2024 European Commission | eDelivery | DomiSMP
%%
Licensed under the EUPL, Version 1.2 or – as soon they will be approved by the European Commission - subsequent
versions of the EUPL (the "Licence");
diff --git a/smp-server-library/src/test/resources/input/ServiceMetadata.xml b/smp-server-library/src/test/resources/input/ServiceMetadata.xml
index 9e737823d6d42321255fb708bbccc39741af2e2f..7d7fe0cf3967ca6fda16dd6c41e705428cd2d4b9 100644
--- a/smp-server-library/src/test/resources/input/ServiceMetadata.xml
+++ b/smp-server-library/src/test/resources/input/ServiceMetadata.xml
@@ -3,7 +3,7 @@
#START_LICENSE#
smp-server-library
%%
- Copyright (C) 2017 - 2023 European Commission | eDelivery | DomiSMP
+ Copyright (C) 2017 - 2024 European Commission | eDelivery | DomiSMP
%%
Licensed under the EUPL, Version 1.2 or – as soon they will be approved by the European Commission - subsequent
versions of the EUPL (the "Licence");
diff --git a/smp-server-library/src/test/resources/input/ServiceMetadata_linarized.xml b/smp-server-library/src/test/resources/input/ServiceMetadata_linarized.xml
index 84f8f7e71d7df025c10439c5765de62c6f25289e..d9fa9dfe9c2897c606401d466af6f0465ce11123 100644
--- a/smp-server-library/src/test/resources/input/ServiceMetadata_linarized.xml
+++ b/smp-server-library/src/test/resources/input/ServiceMetadata_linarized.xml
@@ -3,7 +3,7 @@
#START_LICENSE#
smp-server-library
%%
- Copyright (C) 2017 - 2023 European Commission | eDelivery | DomiSMP
+ Copyright (C) 2017 - 2024 European Commission | eDelivery | DomiSMP
%%
Licensed under the EUPL, Version 1.2 or – as soon they will be approved by the European Commission - subsequent
versions of the EUPL (the "Licence");
diff --git a/smp-server-library/src/test/resources/input/SignedServiceMetadata_withoutSignature.xml b/smp-server-library/src/test/resources/input/SignedServiceMetadata_withoutSignature.xml
index 2c0e7deaa0e3072c60a7b635e9fe9db080c784c9..ced9528ab2218fcba2a11c9beec4b9c4ca6174e3 100644
--- a/smp-server-library/src/test/resources/input/SignedServiceMetadata_withoutSignature.xml
+++ b/smp-server-library/src/test/resources/input/SignedServiceMetadata_withoutSignature.xml
@@ -3,7 +3,7 @@
#START_LICENSE#
smp-server-library
%%
- Copyright (C) 2017 - 2023 European Commission | eDelivery | DomiSMP
+ Copyright (C) 2017 - 2024 European Commission | eDelivery | DomiSMP
%%
Licensed under the EUPL, Version 1.2 or – as soon they will be approved by the European Commission - subsequent
versions of the EUPL (the "Licence");
diff --git a/smp-server-library/src/test/resources/logback-test.xml b/smp-server-library/src/test/resources/logback-test.xml
index 23ff7a60ca4fe47b73aa3d7caea08724d9079656..5cd2715f6df215c4f8349ca80fc4a12666516e80 100644
--- a/smp-server-library/src/test/resources/logback-test.xml
+++ b/smp-server-library/src/test/resources/logback-test.xml
@@ -3,7 +3,7 @@
#START_LICENSE#
smp-server-library
%%
- Copyright (C) 2017 - 2023 European Commission | eDelivery | DomiSMP
+ Copyright (C) 2017 - 2024 European Commission | eDelivery | DomiSMP
%%
Licensed under the EUPL, Version 1.2 or – as soon they will be approved by the European Commission - subsequent
versions of the EUPL (the "Licence");
diff --git a/smp-server-library/src/test/resources/persistence-test-h2.properties b/smp-server-library/src/test/resources/persistence-test-h2.properties
index 859b86a21d1c55108a4e0c02f42b12974aec9faf..7cf7fc23a6eb2854a657d82332817dba2cd35944 100644
--- a/smp-server-library/src/test/resources/persistence-test-h2.properties
+++ b/smp-server-library/src/test/resources/persistence-test-h2.properties
@@ -2,7 +2,7 @@
# #START_LICENSE#
# smp-server-library
# %%
-# Copyright (C) 2017 - 2023 European Commission | eDelivery | DomiSMP
+# Copyright (C) 2017 - 2024 European Commission | eDelivery | DomiSMP
# %%
# Licensed under the EUPL, Version 1.2 or – as soon they will be approved by the European Commission - subsequent
# versions of the EUPL (the "Licence");
diff --git a/smp-server-library/src/test/resources/persistence-test-mysql.properties b/smp-server-library/src/test/resources/persistence-test-mysql.properties
index 638d962dff7dcb8faf9912c45287ae7033d7df08..b00dc926f64b256b2b0ac81e513bc838b537c34b 100644
--- a/smp-server-library/src/test/resources/persistence-test-mysql.properties
+++ b/smp-server-library/src/test/resources/persistence-test-mysql.properties
@@ -2,7 +2,7 @@
# #START_LICENSE#
# smp-server-library
# %%
-# Copyright (C) 2017 - 2023 European Commission | eDelivery | DomiSMP
+# Copyright (C) 2017 - 2024 European Commission | eDelivery | DomiSMP
# %%
# Licensed under the EUPL, Version 1.2 or – as soon they will be approved by the European Commission - subsequent
# versions of the EUPL (the "Licence");
diff --git a/smp-server-library/src/test/resources/test-smp.config.properties b/smp-server-library/src/test/resources/test-smp.config.properties
index 5e3f8170263da3aa95220ce0adf622e406ab8743..c87c7c6012d003782daf269bb3b4b33f85728a73 100644
--- a/smp-server-library/src/test/resources/test-smp.config.properties
+++ b/smp-server-library/src/test/resources/test-smp.config.properties
@@ -2,7 +2,7 @@
# #START_LICENSE#
# smp-server-library
# %%
-# Copyright (C) 2017 - 2023 European Commission | eDelivery | DomiSMP
+# Copyright (C) 2017 - 2024 European Commission | eDelivery | DomiSMP
# %%
# Licensed under the EUPL, Version 1.2 or – as soon they will be approved by the European Commission - subsequent
# versions of the EUPL (the "Licence");
diff --git a/smp-spi/src/main/java/eu/europa/ec/smp/spi/ExtensionInfo.java b/smp-spi/src/main/java/eu/europa/ec/smp/spi/ExtensionInfo.java
index ab252b19db9015515ab1a8e80983e14498c56aab..e5944d82808336f072dfb328c24c3b2b39d941ee 100644
--- a/smp-spi/src/main/java/eu/europa/ec/smp/spi/ExtensionInfo.java
+++ b/smp-spi/src/main/java/eu/europa/ec/smp/spi/ExtensionInfo.java
@@ -2,7 +2,7 @@
* #START_LICENSE#
* smp-spi
* %%
- * Copyright (C) 2017 - 2023 European Commission | eDelivery | DomiSMP
+ * Copyright (C) 2017 - 2024 European Commission | eDelivery | DomiSMP
* %%
* Licensed under the EUPL, Version 1.2 or – as soon they will be approved by the European Commission - subsequent
* versions of the EUPL (the "Licence");
diff --git a/smp-spi/src/main/java/eu/europa/ec/smp/spi/PayloadValidatorSpi.java b/smp-spi/src/main/java/eu/europa/ec/smp/spi/PayloadValidatorSpi.java
index abc8b106e1ef603868260b0cf117c6c5a0ee5fdf..5d43dc1226f0a2adb639c2682789479e314ee13c 100644
--- a/smp-spi/src/main/java/eu/europa/ec/smp/spi/PayloadValidatorSpi.java
+++ b/smp-spi/src/main/java/eu/europa/ec/smp/spi/PayloadValidatorSpi.java
@@ -2,7 +2,7 @@
* #START_LICENSE#
* smp-spi
* %%
- * Copyright (C) 2017 - 2023 European Commission | eDelivery | DomiSMP
+ * Copyright (C) 2017 - 2024 European Commission | eDelivery | DomiSMP
* %%
* Licensed under the EUPL, Version 1.2 or – as soon they will be approved by the European Commission - subsequent
* versions of the EUPL (the "Licence");
diff --git a/smp-spi/src/main/java/eu/europa/ec/smp/spi/api/SmpDataServiceApi.java b/smp-spi/src/main/java/eu/europa/ec/smp/spi/api/SmpDataServiceApi.java
index d9c5f19d0138f516e9e804fb60d017d95b47a018..61ddad37509b4650af28a130c0c72c8935e487b4 100644
--- a/smp-spi/src/main/java/eu/europa/ec/smp/spi/api/SmpDataServiceApi.java
+++ b/smp-spi/src/main/java/eu/europa/ec/smp/spi/api/SmpDataServiceApi.java
@@ -2,7 +2,7 @@
* #START_LICENSE#
* smp-spi
* %%
- * Copyright (C) 2017 - 2023 European Commission | eDelivery | DomiSMP
+ * Copyright (C) 2017 - 2024 European Commission | eDelivery | DomiSMP
* %%
* Licensed under the EUPL, Version 1.2 or – as soon they will be approved by the European Commission - subsequent
* versions of the EUPL (the "Licence");
diff --git a/smp-spi/src/main/java/eu/europa/ec/smp/spi/api/SmpIdentifierServiceApi.java b/smp-spi/src/main/java/eu/europa/ec/smp/spi/api/SmpIdentifierServiceApi.java
index 6dbe83fb1d45ccdf3176333b4ca13c018d06cfd4..c94887d0e11186c0ffad519b94319149ba12978b 100644
--- a/smp-spi/src/main/java/eu/europa/ec/smp/spi/api/SmpIdentifierServiceApi.java
+++ b/smp-spi/src/main/java/eu/europa/ec/smp/spi/api/SmpIdentifierServiceApi.java
@@ -2,7 +2,7 @@
* #START_LICENSE#
* smp-spi
* %%
- * Copyright (C) 2017 - 2023 European Commission | eDelivery | DomiSMP
+ * Copyright (C) 2017 - 2024 European Commission | eDelivery | DomiSMP
* %%
* Licensed under the EUPL, Version 1.2 or – as soon they will be approved by the European Commission - subsequent
* versions of the EUPL (the "Licence");
diff --git a/smp-spi/src/main/java/eu/europa/ec/smp/spi/api/SmpXmlSignatureApi.java b/smp-spi/src/main/java/eu/europa/ec/smp/spi/api/SmpXmlSignatureApi.java
index 503e520e469bc689de0bfda643be6845ef112807..55d1c7622dc6d95f7202c3feb3eb4e361364e289 100644
--- a/smp-spi/src/main/java/eu/europa/ec/smp/spi/api/SmpXmlSignatureApi.java
+++ b/smp-spi/src/main/java/eu/europa/ec/smp/spi/api/SmpXmlSignatureApi.java
@@ -2,7 +2,7 @@
* #START_LICENSE#
* smp-spi
* %%
- * Copyright (C) 2017 - 2023 European Commission | eDelivery | DomiSMP
+ * Copyright (C) 2017 - 2024 European Commission | eDelivery | DomiSMP
* %%
* Licensed under the EUPL, Version 1.2 or – as soon they will be approved by the European Commission - subsequent
* versions of the EUPL (the "Licence");
diff --git a/smp-spi/src/main/java/eu/europa/ec/smp/spi/api/model/RequestData.java b/smp-spi/src/main/java/eu/europa/ec/smp/spi/api/model/RequestData.java
index 173c33fc2a6fc35f20e62301afdf264536b9c39d..d31b29c533c102cdcc2e70a16d50286e883696ee 100644
--- a/smp-spi/src/main/java/eu/europa/ec/smp/spi/api/model/RequestData.java
+++ b/smp-spi/src/main/java/eu/europa/ec/smp/spi/api/model/RequestData.java
@@ -2,7 +2,7 @@
* #START_LICENSE#
* smp-spi
* %%
- * Copyright (C) 2017 - 2023 European Commission | eDelivery | DomiSMP
+ * Copyright (C) 2017 - 2024 European Commission | eDelivery | DomiSMP
* %%
* Licensed under the EUPL, Version 1.2 or – as soon they will be approved by the European Commission - subsequent
* versions of the EUPL (the "Licence");
diff --git a/smp-spi/src/main/java/eu/europa/ec/smp/spi/api/model/ResourceIdentifier.java b/smp-spi/src/main/java/eu/europa/ec/smp/spi/api/model/ResourceIdentifier.java
index eeb9dc20f3c27834581394b1aa3b908accdfa12e..f7b0c9d4b31d0f2ff95f283b0b88af3abbd90be8 100644
--- a/smp-spi/src/main/java/eu/europa/ec/smp/spi/api/model/ResourceIdentifier.java
+++ b/smp-spi/src/main/java/eu/europa/ec/smp/spi/api/model/ResourceIdentifier.java
@@ -2,7 +2,7 @@
* #START_LICENSE#
* smp-spi
* %%
- * Copyright (C) 2017 - 2023 European Commission | eDelivery | DomiSMP
+ * Copyright (C) 2017 - 2024 European Commission | eDelivery | DomiSMP
* %%
* Licensed under the EUPL, Version 1.2 or – as soon they will be approved by the European Commission - subsequent
* versions of the EUPL (the "Licence");
diff --git a/smp-spi/src/main/java/eu/europa/ec/smp/spi/api/model/ResponseData.java b/smp-spi/src/main/java/eu/europa/ec/smp/spi/api/model/ResponseData.java
index 52c8c9804bc9900d1a67ff9579b4c48bdec94df3..e50903b14c96baaa1324c551692e045609cf0687 100644
--- a/smp-spi/src/main/java/eu/europa/ec/smp/spi/api/model/ResponseData.java
+++ b/smp-spi/src/main/java/eu/europa/ec/smp/spi/api/model/ResponseData.java
@@ -2,7 +2,7 @@
* #START_LICENSE#
* smp-spi
* %%
- * Copyright (C) 2017 - 2023 European Commission | eDelivery | DomiSMP
+ * Copyright (C) 2017 - 2024 European Commission | eDelivery | DomiSMP
* %%
* Licensed under the EUPL, Version 1.2 or – as soon they will be approved by the European Commission - subsequent
* versions of the EUPL (the "Licence");
diff --git a/smp-spi/src/main/java/eu/europa/ec/smp/spi/exceptions/PayloadValidatorSpiException.java b/smp-spi/src/main/java/eu/europa/ec/smp/spi/exceptions/PayloadValidatorSpiException.java
index 2750d31941e8a91841ad2eda1ff7edba67eab3f2..741850346472585339202499f69d8bc558aa4a81 100644
--- a/smp-spi/src/main/java/eu/europa/ec/smp/spi/exceptions/PayloadValidatorSpiException.java
+++ b/smp-spi/src/main/java/eu/europa/ec/smp/spi/exceptions/PayloadValidatorSpiException.java
@@ -2,7 +2,7 @@
* #START_LICENSE#
* smp-spi
* %%
- * Copyright (C) 2017 - 2023 European Commission | eDelivery | DomiSMP
+ * Copyright (C) 2017 - 2024 European Commission | eDelivery | DomiSMP
* %%
* Licensed under the EUPL, Version 1.2 or – as soon they will be approved by the European Commission - subsequent
* versions of the EUPL (the "Licence");
diff --git a/smp-spi/src/main/java/eu/europa/ec/smp/spi/exceptions/ResourceException.java b/smp-spi/src/main/java/eu/europa/ec/smp/spi/exceptions/ResourceException.java
index cbf1f98a8ad46d68cc4964fe29ad578d961b10d0..9b6bb544b10b6aad1e7c4ad054b5ff8525fe3e5e 100644
--- a/smp-spi/src/main/java/eu/europa/ec/smp/spi/exceptions/ResourceException.java
+++ b/smp-spi/src/main/java/eu/europa/ec/smp/spi/exceptions/ResourceException.java
@@ -2,7 +2,7 @@
* #START_LICENSE#
* smp-spi
* %%
- * Copyright (C) 2017 - 2023 European Commission | eDelivery | DomiSMP
+ * Copyright (C) 2017 - 2024 European Commission | eDelivery | DomiSMP
* %%
* Licensed under the EUPL, Version 1.2 or – as soon they will be approved by the European Commission - subsequent
* versions of the EUPL (the "Licence");
diff --git a/smp-spi/src/main/java/eu/europa/ec/smp/spi/exceptions/SignatureException.java b/smp-spi/src/main/java/eu/europa/ec/smp/spi/exceptions/SignatureException.java
index 2ed774f5b0e9849582fcd53749381b08bce858ac..09759963d7d66fbf9c2508576a43aa61eaa037af 100644
--- a/smp-spi/src/main/java/eu/europa/ec/smp/spi/exceptions/SignatureException.java
+++ b/smp-spi/src/main/java/eu/europa/ec/smp/spi/exceptions/SignatureException.java
@@ -2,7 +2,7 @@
* #START_LICENSE#
* smp-spi
* %%
- * Copyright (C) 2017 - 2023 European Commission | eDelivery | DomiSMP
+ * Copyright (C) 2017 - 2024 European Commission | eDelivery | DomiSMP
* %%
* Licensed under the EUPL, Version 1.2 or – as soon they will be approved by the European Commission - subsequent
* versions of the EUPL (the "Licence");
diff --git a/smp-spi/src/main/java/eu/europa/ec/smp/spi/resource/ResourceDefinitionSpi.java b/smp-spi/src/main/java/eu/europa/ec/smp/spi/resource/ResourceDefinitionSpi.java
index d1fcb5705cc130c4f9a48a06566ef0be648a1315..0c37fe16b5fb4b1c92598a55e53982b43ac3591a 100644
--- a/smp-spi/src/main/java/eu/europa/ec/smp/spi/resource/ResourceDefinitionSpi.java
+++ b/smp-spi/src/main/java/eu/europa/ec/smp/spi/resource/ResourceDefinitionSpi.java
@@ -2,7 +2,7 @@
* #START_LICENSE#
* smp-spi
* %%
- * Copyright (C) 2017 - 2023 European Commission | eDelivery | DomiSMP
+ * Copyright (C) 2017 - 2024 European Commission | eDelivery | DomiSMP
* %%
* Licensed under the EUPL, Version 1.2 or – as soon they will be approved by the European Commission - subsequent
* versions of the EUPL (the "Licence");
diff --git a/smp-spi/src/main/java/eu/europa/ec/smp/spi/resource/ResourceHandlerSpi.java b/smp-spi/src/main/java/eu/europa/ec/smp/spi/resource/ResourceHandlerSpi.java
index a229abb44a244de50514bef68dc39bef7a5be516..12084a5c164a323b082e1bcdb2ecbce60b4be666 100644
--- a/smp-spi/src/main/java/eu/europa/ec/smp/spi/resource/ResourceHandlerSpi.java
+++ b/smp-spi/src/main/java/eu/europa/ec/smp/spi/resource/ResourceHandlerSpi.java
@@ -2,7 +2,7 @@
* #START_LICENSE#
* smp-spi
* %%
- * Copyright (C) 2017 - 2023 European Commission | eDelivery | DomiSMP
+ * Copyright (C) 2017 - 2024 European Commission | eDelivery | DomiSMP
* %%
* Licensed under the EUPL, Version 1.2 or – as soon they will be approved by the European Commission - subsequent
* versions of the EUPL (the "Licence");
diff --git a/smp-spi/src/main/java/eu/europa/ec/smp/spi/resource/SubresourceDefinitionSpi.java b/smp-spi/src/main/java/eu/europa/ec/smp/spi/resource/SubresourceDefinitionSpi.java
index db8c6cd8cc60163c22015cde14b67f0d997a7aa3..00cf49ad613244af2d13718786d8cdb3da4f8371 100644
--- a/smp-spi/src/main/java/eu/europa/ec/smp/spi/resource/SubresourceDefinitionSpi.java
+++ b/smp-spi/src/main/java/eu/europa/ec/smp/spi/resource/SubresourceDefinitionSpi.java
@@ -2,7 +2,7 @@
* #START_LICENSE#
* smp-spi
* %%
- * Copyright (C) 2017 - 2023 European Commission | eDelivery | DomiSMP
+ * Copyright (C) 2017 - 2024 European Commission | eDelivery | DomiSMP
* %%
* Licensed under the EUPL, Version 1.2 or – as soon they will be approved by the European Commission - subsequent
* versions of the EUPL (the "Licence");
diff --git a/smp-springboot/src/main/java/eu/europa/ec/springboot/smp/SMPApplication.java b/smp-springboot/src/main/java/eu/europa/ec/springboot/smp/SMPApplication.java
index a15ce5c2d964df5164b3760b3677f2938899f00f..778c04b8360e908dbdc5a8c1114588d7f4b2df0d 100644
--- a/smp-springboot/src/main/java/eu/europa/ec/springboot/smp/SMPApplication.java
+++ b/smp-springboot/src/main/java/eu/europa/ec/springboot/smp/SMPApplication.java
@@ -2,7 +2,7 @@
* #START_LICENSE#
* smp-springboot
* %%
- * Copyright (C) 2017 - 2023 European Commission | eDelivery | DomiSMP
+ * Copyright (C) 2017 - 2024 European Commission | eDelivery | DomiSMP
* %%
* Licensed under the EUPL, Version 1.2 or – as soon they will be approved by the European Commission - subsequent
* versions of the EUPL (the "Licence");
diff --git a/smp-webapp/src/main/java/eu/europa/ec/edelivery/smp/auth/SMPAuthenticationEventListener.java b/smp-webapp/src/main/java/eu/europa/ec/edelivery/smp/auth/SMPAuthenticationEventListener.java
index 66e63514832a03c018d6538adc71f5fc2346011f..aa713ece49ced79d17c6a713c9c087408d8cda3c 100644
--- a/smp-webapp/src/main/java/eu/europa/ec/edelivery/smp/auth/SMPAuthenticationEventListener.java
+++ b/smp-webapp/src/main/java/eu/europa/ec/edelivery/smp/auth/SMPAuthenticationEventListener.java
@@ -2,7 +2,7 @@
* #START_LICENSE#
* smp-webapp
* %%
- * Copyright (C) 2017 - 2023 European Commission | eDelivery | DomiSMP
+ * Copyright (C) 2017 - 2024 European Commission | eDelivery | DomiSMP
* %%
* Licensed under the EUPL, Version 1.2 or – as soon they will be approved by the European Commission - subsequent
* versions of the EUPL (the "Licence");
diff --git a/smp-webapp/src/main/java/eu/europa/ec/edelivery/smp/auth/SMPAuthenticationProvider.java b/smp-webapp/src/main/java/eu/europa/ec/edelivery/smp/auth/SMPAuthenticationProvider.java
index 796821620ca3115a5646bdcba4034a3ec035a25c..99533ceb32c3013553077954f848156968874554 100644
--- a/smp-webapp/src/main/java/eu/europa/ec/edelivery/smp/auth/SMPAuthenticationProvider.java
+++ b/smp-webapp/src/main/java/eu/europa/ec/edelivery/smp/auth/SMPAuthenticationProvider.java
@@ -2,7 +2,7 @@
* #START_LICENSE#
* smp-webapp
* %%
- * Copyright (C) 2017 - 2023 European Commission | eDelivery | DomiSMP
+ * Copyright (C) 2017 - 2024 European Commission | eDelivery | DomiSMP
* %%
* Licensed under the EUPL, Version 1.2 or – as soon they will be approved by the European Commission - subsequent
* versions of the EUPL (the "Licence");
diff --git a/smp-webapp/src/main/java/eu/europa/ec/edelivery/smp/auth/SMPAuthenticationProviderForUI.java b/smp-webapp/src/main/java/eu/europa/ec/edelivery/smp/auth/SMPAuthenticationProviderForUI.java
index 0fb6b8240f92faf327c348b77616376569b45ab0..72c4445820d4c0795f35804469b8f092b1e16dea 100644
--- a/smp-webapp/src/main/java/eu/europa/ec/edelivery/smp/auth/SMPAuthenticationProviderForUI.java
+++ b/smp-webapp/src/main/java/eu/europa/ec/edelivery/smp/auth/SMPAuthenticationProviderForUI.java
@@ -2,7 +2,7 @@
* #START_LICENSE#
* smp-webapp
* %%
- * Copyright (C) 2017 - 2023 European Commission | eDelivery | DomiSMP
+ * Copyright (C) 2017 - 2024 European Commission | eDelivery | DomiSMP
* %%
* Licensed under the EUPL, Version 1.2 or – as soon they will be approved by the European Commission - subsequent
* versions of the EUPL (the "Licence");
diff --git a/smp-webapp/src/main/java/eu/europa/ec/edelivery/smp/auth/SMPAuthenticationService.java b/smp-webapp/src/main/java/eu/europa/ec/edelivery/smp/auth/SMPAuthenticationService.java
index 4ff89507f36b96b12a04f644f3f16dc7cdf21f45..34c2208df9f7529ef6f6e8779344fda0f26b1045 100644
--- a/smp-webapp/src/main/java/eu/europa/ec/edelivery/smp/auth/SMPAuthenticationService.java
+++ b/smp-webapp/src/main/java/eu/europa/ec/edelivery/smp/auth/SMPAuthenticationService.java
@@ -2,7 +2,7 @@
* #START_LICENSE#
* smp-webapp
* %%
- * Copyright (C) 2017 - 2023 European Commission | eDelivery | DomiSMP
+ * Copyright (C) 2017 - 2024 European Commission | eDelivery | DomiSMP
* %%
* Licensed under the EUPL, Version 1.2 or – as soon they will be approved by the European Commission - subsequent
* versions of the EUPL (the "Licence");
diff --git a/smp-webapp/src/main/java/eu/europa/ec/edelivery/smp/auth/SMPAuthorizationService.java b/smp-webapp/src/main/java/eu/europa/ec/edelivery/smp/auth/SMPAuthorizationService.java
index 9c0455d3657461fa03a21a8e66d108aa89b7dd77..b7f32e5c765224990b8b5aff1ef7fbb7a2c87000 100644
--- a/smp-webapp/src/main/java/eu/europa/ec/edelivery/smp/auth/SMPAuthorizationService.java
+++ b/smp-webapp/src/main/java/eu/europa/ec/edelivery/smp/auth/SMPAuthorizationService.java
@@ -2,15 +2,15 @@
* #START_LICENSE#
* smp-webapp
* %%
- * Copyright (C) 2017 - 2023 European Commission | eDelivery | DomiSMP
+ * Copyright (C) 2017 - 2024 European Commission | eDelivery | DomiSMP
* %%
* Licensed under the EUPL, Version 1.2 or – as soon they will be approved by the European Commission - subsequent
* versions of the EUPL (the "Licence");
* You may not use this work except in compliance with the Licence.
* You may obtain a copy of the Licence at:
- *
+ *
* [PROJECT_HOME]\license\eupl-1.2\license.txt or https://joinup.ec.europa.eu/collection/eupl/eupl-text-eupl-12
- *
+ *
* Unless required by applicable law or agreed to in writing, software distributed under the Licence is
* distributed on an "AS IS" basis, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the Licence for the specific language governing permissions and limitations under the Licence.
@@ -102,19 +102,19 @@ public class SMPAuthorizationService {
public boolean isGroupAdministrator(String groupEncId) {
SMPUserDetails userDetails = getAndValidateUserDetails();
- Long groupId = getIdFromEncryptedString(groupEncId, false);
+ Long groupId = getIdFromEncryptedString(groupEncId, false);
return groupMemberDao.isUserGroupMemberWithRole(userDetails.getUser().getId(), Collections.singletonList(groupId), MembershipRoleType.ADMIN);
}
public boolean isResourceAdministrator(String resourceEncId) {
SMPUserDetails userDetails = getAndValidateUserDetails();
- Long resourceId = getIdFromEncryptedString(resourceEncId, false);
+ Long resourceId = getIdFromEncryptedString(resourceEncId, false);
return resourceMemberDao.isUserResourceMemberWithRole(userDetails.getUser().getId(), resourceId, MembershipRoleType.ADMIN);
}
public boolean isResourceMember(String resourceEncId) {
SMPUserDetails userDetails = getAndValidateUserDetails();
- Long resourceId = getIdFromEncryptedString(resourceEncId, false);
+ Long resourceId = getIdFromEncryptedString(resourceEncId, false);
return resourceMemberDao.isUserResourceMember(userDetails.getUser().getId(), resourceId);
}
@@ -130,6 +130,7 @@ public class SMPAuthorizationService {
/**
* Returns true if logged user is administrator for any of the domain group
+ *
* @param domainEncId
* @return true if logged user is group administrator in domain
*/
@@ -141,6 +142,7 @@ public class SMPAuthorizationService {
/**
* Returns true if logged user is administrator for any of the resources on group
+ *
* @param groupEncId
* @return true if logged user is resource administrator in the group
*/
@@ -216,7 +218,7 @@ public class SMPAuthorizationService {
public UserRO getUserData(DBUser user) {
UserRO userRO = conversionService.convert(user, UserRO.class);
- return getUpdatedUserData(userRO);
+ return userRO == null ? null : getUpdatedUserData(userRO);
}
/**
diff --git a/smp-webapp/src/main/java/eu/europa/ec/edelivery/smp/auth/URLCsrfIgnoreMatcher.java b/smp-webapp/src/main/java/eu/europa/ec/edelivery/smp/auth/URLCsrfIgnoreMatcher.java
index 6894b1596ce936edccc57bc4bf6e9ef5d9a7e44a..37498edc0a9e6a350f2fd5a3e6badd0447db9fbb 100644
--- a/smp-webapp/src/main/java/eu/europa/ec/edelivery/smp/auth/URLCsrfIgnoreMatcher.java
+++ b/smp-webapp/src/main/java/eu/europa/ec/edelivery/smp/auth/URLCsrfIgnoreMatcher.java
@@ -2,7 +2,7 @@
* #START_LICENSE#
* smp-webapp
* %%
- * Copyright (C) 2017 - 2023 European Commission | eDelivery | DomiSMP
+ * Copyright (C) 2017 - 2024 European Commission | eDelivery | DomiSMP
* %%
* Licensed under the EUPL, Version 1.2 or – as soon they will be approved by the European Commission - subsequent
* versions of the EUPL (the "Licence");
diff --git a/smp-webapp/src/main/java/eu/europa/ec/edelivery/smp/auth/cas/CasContainerAttributeHandler.java b/smp-webapp/src/main/java/eu/europa/ec/edelivery/smp/auth/cas/CasContainerAttributeHandler.java
index b56d0527f63260a0d6f27a8d5a489a1ff3b0498a..656b9ec4a65e31e4134f51c975ed13c864975603 100644
--- a/smp-webapp/src/main/java/eu/europa/ec/edelivery/smp/auth/cas/CasContainerAttributeHandler.java
+++ b/smp-webapp/src/main/java/eu/europa/ec/edelivery/smp/auth/cas/CasContainerAttributeHandler.java
@@ -1,3 +1,21 @@
+/*-
+ * #START_LICENSE#
+ * smp-webapp
+ * %%
+ * Copyright (C) 2017 - 2024 European Commission | eDelivery | DomiSMP
+ * %%
+ * Licensed under the EUPL, Version 1.2 or – as soon they will be approved by the European Commission - subsequent
+ * versions of the EUPL (the "Licence");
+ * You may not use this work except in compliance with the Licence.
+ * You may obtain a copy of the Licence at:
+ *
+ * [PROJECT_HOME]\license\eupl-1.2\license.txt or https://joinup.ec.europa.eu/collection/eupl/eupl-text-eupl-12
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the Licence is
+ * distributed on an "AS IS" basis, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the Licence for the specific language governing permissions and limitations under the Licence.
+ * #END_LICENSE#
+ */
package eu.europa.ec.edelivery.smp.auth.cas;
import org.slf4j.Logger;
diff --git a/smp-webapp/src/main/java/eu/europa/ec/edelivery/smp/auth/cas/SMPCas20ServiceTicketValidator.java b/smp-webapp/src/main/java/eu/europa/ec/edelivery/smp/auth/cas/SMPCas20ServiceTicketValidator.java
index f6abe4eedae714611be0a13e18cb135cddc3cac3..3314ef580fac383207c758280b73c291ca9eae2a 100644
--- a/smp-webapp/src/main/java/eu/europa/ec/edelivery/smp/auth/cas/SMPCas20ServiceTicketValidator.java
+++ b/smp-webapp/src/main/java/eu/europa/ec/edelivery/smp/auth/cas/SMPCas20ServiceTicketValidator.java
@@ -2,7 +2,7 @@
* #START_LICENSE#
* smp-webapp
* %%
- * Copyright (C) 2017 - 2023 European Commission | eDelivery | DomiSMP
+ * Copyright (C) 2017 - 2024 European Commission | eDelivery | DomiSMP
* %%
* Licensed under the EUPL, Version 1.2 or – as soon they will be approved by the European Commission - subsequent
* versions of the EUPL (the "Licence");
diff --git a/smp-webapp/src/main/java/eu/europa/ec/edelivery/smp/auth/cas/SMPCasConfigurer.java b/smp-webapp/src/main/java/eu/europa/ec/edelivery/smp/auth/cas/SMPCasConfigurer.java
index d09ac8422c3afb4885ada5166d7b9d2901a15323..7585ae6f5834ed5ffb3b353fe3c760ec9cb39648 100644
--- a/smp-webapp/src/main/java/eu/europa/ec/edelivery/smp/auth/cas/SMPCasConfigurer.java
+++ b/smp-webapp/src/main/java/eu/europa/ec/edelivery/smp/auth/cas/SMPCasConfigurer.java
@@ -2,7 +2,7 @@
* #START_LICENSE#
* smp-webapp
* %%
- * Copyright (C) 2017 - 2023 European Commission | eDelivery | DomiSMP
+ * Copyright (C) 2017 - 2024 European Commission | eDelivery | DomiSMP
* %%
* Licensed under the EUPL, Version 1.2 or – as soon they will be approved by the European Commission - subsequent
* versions of the EUPL (the "Licence");
diff --git a/smp-webapp/src/main/java/eu/europa/ec/edelivery/smp/auth/cas/SMPCasUserService.java b/smp-webapp/src/main/java/eu/europa/ec/edelivery/smp/auth/cas/SMPCasUserService.java
index 9d12b48212761ec76ecf13fd0081124e7998463d..5b22b2f9f0cd53ba74410237b17c9e224c397b38 100644
--- a/smp-webapp/src/main/java/eu/europa/ec/edelivery/smp/auth/cas/SMPCasUserService.java
+++ b/smp-webapp/src/main/java/eu/europa/ec/edelivery/smp/auth/cas/SMPCasUserService.java
@@ -2,7 +2,7 @@
* #START_LICENSE#
* smp-webapp
* %%
- * Copyright (C) 2017 - 2023 European Commission | eDelivery | DomiSMP
+ * Copyright (C) 2017 - 2024 European Commission | eDelivery | DomiSMP
* %%
* Licensed under the EUPL, Version 1.2 or – as soon they will be approved by the European Commission - subsequent
* versions of the EUPL (the "Licence");
@@ -124,7 +124,7 @@ public class SMPCasUserService implements AuthenticationUserDetailsService<CasAs
return dbUser;
}
- public String getValueFromCasPrincipal(MappingData data, Map<String, Object> attributes, Map<String,String> mapping){
+ protected String getValueFromCasPrincipal(MappingData data, Map<String, Object> attributes, Map<String,String> mapping){
String template = mapping.getOrDefault(data.name(), data.getDefaultValue());
return StringNamedSubstitutor.resolve(template, attributes);
}
diff --git a/smp-webapp/src/main/java/eu/europa/ec/edelivery/smp/config/GlobalMethodSecurityConfig.java b/smp-webapp/src/main/java/eu/europa/ec/edelivery/smp/config/GlobalMethodSecurityConfig.java
index c2f8454d1a185637d9e810762525c3efd2fca99c..524d68706bea088137707a38734bd06d43b90f63 100644
--- a/smp-webapp/src/main/java/eu/europa/ec/edelivery/smp/config/GlobalMethodSecurityConfig.java
+++ b/smp-webapp/src/main/java/eu/europa/ec/edelivery/smp/config/GlobalMethodSecurityConfig.java
@@ -2,7 +2,7 @@
* #START_LICENSE#
* smp-webapp
* %%
- * Copyright (C) 2017 - 2023 European Commission | eDelivery | DomiSMP
+ * Copyright (C) 2017 - 2024 European Commission | eDelivery | DomiSMP
* %%
* Licensed under the EUPL, Version 1.2 or – as soon they will be approved by the European Commission - subsequent
* versions of the EUPL (the "Licence");
diff --git a/smp-webapp/src/main/java/eu/europa/ec/edelivery/smp/config/MDCLogRequestFilter.java b/smp-webapp/src/main/java/eu/europa/ec/edelivery/smp/config/MDCLogRequestFilter.java
index 086ca3224a69a61b44ca10cbf136af322d9701e1..fdd7b3797247600c07329d05c146e807352d0b4c 100644
--- a/smp-webapp/src/main/java/eu/europa/ec/edelivery/smp/config/MDCLogRequestFilter.java
+++ b/smp-webapp/src/main/java/eu/europa/ec/edelivery/smp/config/MDCLogRequestFilter.java
@@ -2,7 +2,7 @@
* #START_LICENSE#
* smp-webapp
* %%
- * Copyright (C) 2017 - 2023 European Commission | eDelivery | DomiSMP
+ * Copyright (C) 2017 - 2024 European Commission | eDelivery | DomiSMP
* %%
* Licensed under the EUPL, Version 1.2 or – as soon they will be approved by the European Commission - subsequent
* versions of the EUPL (the "Licence");
diff --git a/smp-webapp/src/main/java/eu/europa/ec/edelivery/smp/config/SMPSecurityConstants.java b/smp-webapp/src/main/java/eu/europa/ec/edelivery/smp/config/SMPSecurityConstants.java
index 785c7be842cdeb3f88f5406f6bd9e71df9a76f58..77aa6370bf6c3fb9340692081f9cf132861a9cbc 100644
--- a/smp-webapp/src/main/java/eu/europa/ec/edelivery/smp/config/SMPSecurityConstants.java
+++ b/smp-webapp/src/main/java/eu/europa/ec/edelivery/smp/config/SMPSecurityConstants.java
@@ -2,7 +2,7 @@
* #START_LICENSE#
* smp-webapp
* %%
- * Copyright (C) 2017 - 2023 European Commission | eDelivery | DomiSMP
+ * Copyright (C) 2017 - 2024 European Commission | eDelivery | DomiSMP
* %%
* Licensed under the EUPL, Version 1.2 or – as soon they will be approved by the European Commission - subsequent
* versions of the EUPL (the "Licence");
diff --git a/smp-webapp/src/main/java/eu/europa/ec/edelivery/smp/config/SMPTaskSchedulerConfig.java b/smp-webapp/src/main/java/eu/europa/ec/edelivery/smp/config/SMPTaskSchedulerConfig.java
index b24c06ac4161e1ba433cba71a22a48be73b36228..c600a788566c27af1d0b93a2993364d00d1006d2 100644
--- a/smp-webapp/src/main/java/eu/europa/ec/edelivery/smp/config/SMPTaskSchedulerConfig.java
+++ b/smp-webapp/src/main/java/eu/europa/ec/edelivery/smp/config/SMPTaskSchedulerConfig.java
@@ -2,7 +2,7 @@
* #START_LICENSE#
* smp-webapp
* %%
- * Copyright (C) 2017 - 2023 European Commission | eDelivery | DomiSMP
+ * Copyright (C) 2017 - 2024 European Commission | eDelivery | DomiSMP
* %%
* Licensed under the EUPL, Version 1.2 or – as soon they will be approved by the European Commission - subsequent
* versions of the EUPL (the "Licence");
diff --git a/smp-webapp/src/main/java/eu/europa/ec/edelivery/smp/config/SMPWebAppConfig.java b/smp-webapp/src/main/java/eu/europa/ec/edelivery/smp/config/SMPWebAppConfig.java
index 4dd672e7fd85c9d0f38d15d69ff3e8a76507d213..d0ff48fde005834f22046f5a6fb4549c18a36011 100644
--- a/smp-webapp/src/main/java/eu/europa/ec/edelivery/smp/config/SMPWebAppConfig.java
+++ b/smp-webapp/src/main/java/eu/europa/ec/edelivery/smp/config/SMPWebAppConfig.java
@@ -2,7 +2,7 @@
* #START_LICENSE#
* smp-webapp
* %%
- * Copyright (C) 2017 - 2023 European Commission | eDelivery | DomiSMP
+ * Copyright (C) 2017 - 2024 European Commission | eDelivery | DomiSMP
* %%
* Licensed under the EUPL, Version 1.2 or – as soon they will be approved by the European Commission - subsequent
* versions of the EUPL (the "Licence");
@@ -41,8 +41,6 @@ import java.text.SimpleDateFormat;
import java.util.List;
import java.util.TimeZone;
-import static org.springframework.core.Ordered.HIGHEST_PRECEDENCE;
-
/**
* This is the entry point of the DomiSMP application (beans)configuration/setup.
* <p>
@@ -94,8 +92,8 @@ import static org.springframework.core.Ordered.HIGHEST_PRECEDENCE;
@ComponentScan.Filter(type = FilterType.ASSIGNABLE_TYPE, value = SMPWebAppConfig.class)})
@PropertySource(value = "classpath:/application.properties", ignoreResourceNotFound = true)
public class SMPWebAppConfig implements WebMvcConfigurer {
-
private static final Logger LOG = LoggerFactory.getLogger(SMPWebAppConfig.class);
+ private static final int HIGHEST_ORDER= Integer. MAX_VALUE;
@Override
public void addCorsMappings(CorsRegistry registry) {
@@ -106,12 +104,12 @@ public class SMPWebAppConfig implements WebMvcConfigurer {
@Override
public void addResourceHandlers(ResourceHandlerRegistry registry) {
- registry.setOrder(HIGHEST_PRECEDENCE)
+ registry.setOrder(HIGHEST_ORDER)
.addResourceHandler("/index.html", "/favicon.png", "/favicon.ico").addResourceLocations("/html/");
- registry.setOrder(HIGHEST_PRECEDENCE - 2)
+ registry.setOrder(HIGHEST_ORDER - 2)
.addResourceHandler("/ui/rest/").addResourceLocations("/"); // ui rest resources
- registry.setOrder(HIGHEST_PRECEDENCE - 3)
+ registry.setOrder(HIGHEST_ORDER - 3)
.addResourceHandler("/ui/**").addResourceLocations("/ui/"); // angular pages
}
diff --git a/smp-webapp/src/main/java/eu/europa/ec/edelivery/smp/config/SMPWebApplicationInitializer.java b/smp-webapp/src/main/java/eu/europa/ec/edelivery/smp/config/SMPWebApplicationInitializer.java
index dde4519505b4efb85b15d21922a9ff3f9ce2630d..052697c636126abbc1fc0c765db95ce143a2cc57 100644
--- a/smp-webapp/src/main/java/eu/europa/ec/edelivery/smp/config/SMPWebApplicationInitializer.java
+++ b/smp-webapp/src/main/java/eu/europa/ec/edelivery/smp/config/SMPWebApplicationInitializer.java
@@ -2,7 +2,7 @@
* #START_LICENSE#
* smp-webapp
* %%
- * Copyright (C) 2017 - 2023 European Commission | eDelivery | DomiSMP
+ * Copyright (C) 2017 - 2024 European Commission | eDelivery | DomiSMP
* %%
* Licensed under the EUPL, Version 1.2 or – as soon they will be approved by the European Commission - subsequent
* versions of the EUPL (the "Licence");
diff --git a/smp-webapp/src/main/java/eu/europa/ec/edelivery/smp/config/UISecurityConfigurerAdapter.java b/smp-webapp/src/main/java/eu/europa/ec/edelivery/smp/config/UISecurityConfigurerAdapter.java
index 1230d371eeaa8a14f255ba1dc9d4ddca146719d5..b34f8cc9d1e0cbd843e9a65e83e449e54702b480 100644
--- a/smp-webapp/src/main/java/eu/europa/ec/edelivery/smp/config/UISecurityConfigurerAdapter.java
+++ b/smp-webapp/src/main/java/eu/europa/ec/edelivery/smp/config/UISecurityConfigurerAdapter.java
@@ -2,7 +2,7 @@
* #START_LICENSE#
* smp-webapp
* %%
- * Copyright (C) 2017 - 2023 European Commission | eDelivery | DomiSMP
+ * Copyright (C) 2017 - 2024 European Commission | eDelivery | DomiSMP
* %%
* Licensed under the EUPL, Version 1.2 or – as soon they will be approved by the European Commission - subsequent
* versions of the EUPL (the "Licence");
diff --git a/smp-webapp/src/main/java/eu/europa/ec/edelivery/smp/config/WSSecurityConfigurerAdapter.java b/smp-webapp/src/main/java/eu/europa/ec/edelivery/smp/config/WSSecurityConfigurerAdapter.java
index c43d236d10375f639b62c876f2be99b34cec4cc9..41c686adc51b860ccadfc78784a0af1448aa4dc4 100644
--- a/smp-webapp/src/main/java/eu/europa/ec/edelivery/smp/config/WSSecurityConfigurerAdapter.java
+++ b/smp-webapp/src/main/java/eu/europa/ec/edelivery/smp/config/WSSecurityConfigurerAdapter.java
@@ -2,7 +2,7 @@
* #START_LICENSE#
* smp-webapp
* %%
- * Copyright (C) 2017 - 2023 European Commission | eDelivery | DomiSMP
+ * Copyright (C) 2017 - 2024 European Commission | eDelivery | DomiSMP
* %%
* Licensed under the EUPL, Version 1.2 or – as soon they will be approved by the European Commission - subsequent
* versions of the EUPL (the "Licence");
diff --git a/smp-webapp/src/main/java/eu/europa/ec/edelivery/smp/config/properties/SMPCronExpressionPropertyUpdateListener.java b/smp-webapp/src/main/java/eu/europa/ec/edelivery/smp/config/properties/SMPCronExpressionPropertyUpdateListener.java
index a1219b8df672ec43fa5fdf56539e204dd0da11bc..d1ae4ff74d879f6f2575fb926b9d57295ccc1f85 100644
--- a/smp-webapp/src/main/java/eu/europa/ec/edelivery/smp/config/properties/SMPCronExpressionPropertyUpdateListener.java
+++ b/smp-webapp/src/main/java/eu/europa/ec/edelivery/smp/config/properties/SMPCronExpressionPropertyUpdateListener.java
@@ -2,7 +2,7 @@
* #START_LICENSE#
* smp-webapp
* %%
- * Copyright (C) 2017 - 2023 European Commission | eDelivery | DomiSMP
+ * Copyright (C) 2017 - 2024 European Commission | eDelivery | DomiSMP
* %%
* Licensed under the EUPL, Version 1.2 or – as soon they will be approved by the European Commission - subsequent
* versions of the EUPL (the "Licence");
diff --git a/smp-webapp/src/main/java/eu/europa/ec/edelivery/smp/config/properties/SMPIdentifierServicePropertyUpdateListener.java b/smp-webapp/src/main/java/eu/europa/ec/edelivery/smp/config/properties/SMPIdentifierServicePropertyUpdateListener.java
index 093c76d6872a04bc9047e1aa7e12467e660cdfff..ee0c8b928d3286f6c096d09926e7f92a26f495a9 100644
--- a/smp-webapp/src/main/java/eu/europa/ec/edelivery/smp/config/properties/SMPIdentifierServicePropertyUpdateListener.java
+++ b/smp-webapp/src/main/java/eu/europa/ec/edelivery/smp/config/properties/SMPIdentifierServicePropertyUpdateListener.java
@@ -2,7 +2,7 @@
* #START_LICENSE#
* smp-webapp
* %%
- * Copyright (C) 2017 - 2023 European Commission | eDelivery | DomiSMP
+ * Copyright (C) 2017 - 2024 European Commission | eDelivery | DomiSMP
* %%
* Licensed under the EUPL, Version 1.2 or – as soon they will be approved by the European Commission - subsequent
* versions of the EUPL (the "Licence");
@@ -33,7 +33,15 @@ import java.util.regex.Pattern;
import static eu.europa.ec.edelivery.smp.config.enums.SMPPropertyEnum.*;
/**
- * Class update mail sender configuration on property update event
+ * It is used to update identifier configuration if properties are changed.
+ * It listens for changes in the following properties:
+ * <ul>
+ * <li>{@link SMPPropertyEnum#PARTC_SCH_SPLIT_REGEXP}</li>
+ * <li>{@link SMPPropertyEnum#PARTC_SCH_VALIDATION_REGEXP}</li>
+ * <li>{@link SMPPropertyEnum#PARTC_SCH_MANDATORY}</li>
+ * <li>{@link SMPPropertyEnum#CS_PARTICIPANTS}</li>
+ * <li>{@link SMPPropertyEnum#CS_DOCUMENTS}</li>
+ * </ul>
*
* @author Joze Rihtarsic
* @since 5.0
diff --git a/smp-webapp/src/main/java/eu/europa/ec/edelivery/smp/config/properties/SMPMailPropertyUpdateListener.java b/smp-webapp/src/main/java/eu/europa/ec/edelivery/smp/config/properties/SMPMailPropertyUpdateListener.java
index 7000be35fa330db8d563121b496c549d34c532c9..9e65305fc8e50c0f1ef9ac9db5a64a9d4113fd25 100644
--- a/smp-webapp/src/main/java/eu/europa/ec/edelivery/smp/config/properties/SMPMailPropertyUpdateListener.java
+++ b/smp-webapp/src/main/java/eu/europa/ec/edelivery/smp/config/properties/SMPMailPropertyUpdateListener.java
@@ -2,7 +2,7 @@
* #START_LICENSE#
* smp-webapp
* %%
- * Copyright (C) 2017 - 2023 European Commission | eDelivery | DomiSMP
+ * Copyright (C) 2017 - 2024 European Commission | eDelivery | DomiSMP
* %%
* Licensed under the EUPL, Version 1.2 or – as soon they will be approved by the European Commission - subsequent
* versions of the EUPL (the "Licence");
diff --git a/smp-webapp/src/main/java/eu/europa/ec/edelivery/smp/config/properties/SMPSecurityPropertyUpdateListener.java b/smp-webapp/src/main/java/eu/europa/ec/edelivery/smp/config/properties/SMPSecurityPropertyUpdateListener.java
index a167e97e7196a759adbe2732fe36b17340efa502..6f88e0b8696b28088ac37feec26539ff99f25bd9 100644
--- a/smp-webapp/src/main/java/eu/europa/ec/edelivery/smp/config/properties/SMPSecurityPropertyUpdateListener.java
+++ b/smp-webapp/src/main/java/eu/europa/ec/edelivery/smp/config/properties/SMPSecurityPropertyUpdateListener.java
@@ -2,7 +2,7 @@
* #START_LICENSE#
* smp-webapp
* %%
- * Copyright (C) 2017 - 2023 European Commission | eDelivery | DomiSMP
+ * Copyright (C) 2017 - 2024 European Commission | eDelivery | DomiSMP
* %%
* Licensed under the EUPL, Version 1.2 or – as soon they will be approved by the European Commission - subsequent
* versions of the EUPL (the "Licence");
diff --git a/smp-webapp/src/main/java/eu/europa/ec/edelivery/smp/controllers/ResourceController.java b/smp-webapp/src/main/java/eu/europa/ec/edelivery/smp/controllers/ResourceController.java
index 917ca1ffb53ac500059a34337e8a4e2e9a03cf88..7b4ab905edded51ec2d8c76fcbc7b44347bdb786 100644
--- a/smp-webapp/src/main/java/eu/europa/ec/edelivery/smp/controllers/ResourceController.java
+++ b/smp-webapp/src/main/java/eu/europa/ec/edelivery/smp/controllers/ResourceController.java
@@ -2,7 +2,7 @@
* #START_LICENSE#
* smp-webapp
* %%
- * Copyright (C) 2017 - 2023 European Commission | eDelivery | DomiSMP
+ * Copyright (C) 2017 - 2024 European Commission | eDelivery | DomiSMP
* %%
* Licensed under the EUPL, Version 1.2 or – as soon they will be approved by the European Commission - subsequent
* versions of the EUPL (the "Licence");
diff --git a/smp-webapp/src/main/java/eu/europa/ec/edelivery/smp/controllers/RootController.java b/smp-webapp/src/main/java/eu/europa/ec/edelivery/smp/controllers/RootController.java
index 3aca656e3ff600ac69407aece98c145d0e3eb1ae..9f4a084fdad0d829260d2fbaa99ba8eb5bda8d07 100644
--- a/smp-webapp/src/main/java/eu/europa/ec/edelivery/smp/controllers/RootController.java
+++ b/smp-webapp/src/main/java/eu/europa/ec/edelivery/smp/controllers/RootController.java
@@ -2,7 +2,7 @@
* #START_LICENSE#
* smp-webapp
* %%
- * Copyright (C) 2017 - 2023 European Commission | eDelivery | DomiSMP
+ * Copyright (C) 2017 - 2024 European Commission | eDelivery | DomiSMP
* %%
* Licensed under the EUPL, Version 1.2 or – as soon they will be approved by the European Commission - subsequent
* versions of the EUPL (the "Licence");
@@ -72,10 +72,10 @@ public class RootController {
return IOUtils.readBytesFromStream(RootController.class.getResourceAsStream("/html/index.html"));
}
- if (value != null && value.endsWith("favicon.png")) {
+ if (value.endsWith("favicon.png")) {
httpRes.setContentType(MediaType.IMAGE_PNG_VALUE);
return IOUtils.readBytesFromStream(RootController.class.getResourceAsStream("/html/favicon.png"));
- } else if (value != null && value.endsWith("favicon.ico")) {
+ } else if (value.endsWith("favicon.ico")) {
httpRes.setContentType("image/x-ico");
return IOUtils.readBytesFromStream(RootController.class.getResourceAsStream("/html/favicon.ico"));
}
diff --git a/smp-webapp/src/main/java/eu/europa/ec/edelivery/smp/error/AbstractErrorControllerAdvice.java b/smp-webapp/src/main/java/eu/europa/ec/edelivery/smp/error/AbstractErrorControllerAdvice.java
index cb530c2a98030f5688dd8428b873635bddf44b50..17577ff99f661a6bd3ebc8bd0fc6326129b584a6 100644
--- a/smp-webapp/src/main/java/eu/europa/ec/edelivery/smp/error/AbstractErrorControllerAdvice.java
+++ b/smp-webapp/src/main/java/eu/europa/ec/edelivery/smp/error/AbstractErrorControllerAdvice.java
@@ -2,7 +2,7 @@
* #START_LICENSE#
* smp-webapp
* %%
- * Copyright (C) 2017 - 2023 European Commission | eDelivery | DomiSMP
+ * Copyright (C) 2017 - 2024 European Commission | eDelivery | DomiSMP
* %%
* Licensed under the EUPL, Version 1.2 or – as soon they will be approved by the European Commission - subsequent
* versions of the EUPL (the "Licence");
diff --git a/smp-webapp/src/main/java/eu/europa/ec/edelivery/smp/error/SMPSecurityExceptionHandler.java b/smp-webapp/src/main/java/eu/europa/ec/edelivery/smp/error/SMPSecurityExceptionHandler.java
index 1ac9bb414b2e4dcd649627c597dc6368d36baabd..6a0f0fab4e2c28a9162b5a85b599f63111b7b5f5 100644
--- a/smp-webapp/src/main/java/eu/europa/ec/edelivery/smp/error/SMPSecurityExceptionHandler.java
+++ b/smp-webapp/src/main/java/eu/europa/ec/edelivery/smp/error/SMPSecurityExceptionHandler.java
@@ -2,7 +2,7 @@
* #START_LICENSE#
* smp-webapp
* %%
- * Copyright (C) 2017 - 2023 European Commission | eDelivery | DomiSMP
+ * Copyright (C) 2017 - 2024 European Commission | eDelivery | DomiSMP
* %%
* Licensed under the EUPL, Version 1.2 or – as soon they will be approved by the European Commission - subsequent
* versions of the EUPL (the "Licence");
@@ -92,7 +92,7 @@ public class SMPSecurityExceptionHandler extends BasicAuthenticationEntryPoint i
.build();
String errorUniqueId = ((ErrorResponse) response.getBody()).getErrorUniqueId();
- String logMsg = format("Error unique ID: %s", errorUniqueId);
+ String logMsg = errorUniqueId == null ? "Null Error ID" : format("UI Error unique ID: %s", errorUniqueId);
LOG.warn("Security error:[{}] with [{}].", errorMsg, logMsg);
LOG.debug(logMsg, exception);
return response;
diff --git a/smp-webapp/src/main/java/eu/europa/ec/edelivery/smp/error/ServiceErrorControllerAdvice.java b/smp-webapp/src/main/java/eu/europa/ec/edelivery/smp/error/ServiceErrorControllerAdvice.java
index 0528b6aa0816ae56a2f14012df3313242c211bb8..06df983531493c86f598aff784fd63ec943dead8 100644
--- a/smp-webapp/src/main/java/eu/europa/ec/edelivery/smp/error/ServiceErrorControllerAdvice.java
+++ b/smp-webapp/src/main/java/eu/europa/ec/edelivery/smp/error/ServiceErrorControllerAdvice.java
@@ -2,7 +2,7 @@
* #START_LICENSE#
* smp-webapp
* %%
- * Copyright (C) 2017 - 2023 European Commission | eDelivery | DomiSMP
+ * Copyright (C) 2017 - 2024 European Commission | eDelivery | DomiSMP
* %%
* Licensed under the EUPL, Version 1.2 or – as soon they will be approved by the European Commission - subsequent
* versions of the EUPL (the "Licence");
@@ -43,6 +43,7 @@ import static org.springframework.http.HttpStatus.UNAUTHORIZED;
@RestControllerAdvice({"eu.europa.ec.edelivery.smp.controllers"})
public class ServiceErrorControllerAdvice extends AbstractErrorControllerAdvice {
+ @Override
@ExceptionHandler({RuntimeException.class, SMPRuntimeException.class, SMPResponseStatusException.class, AuthenticationException.class,})
public ResponseEntity handleRuntimeException(RuntimeException ex) {
return super.handleRuntimeException(ex);
@@ -71,7 +72,7 @@ public class ServiceErrorControllerAdvice extends AbstractErrorControllerAdvice
.build();
String errorUniqueId = ((ErrorResponse) response.getBody()).getErrorUniqueId();
- String logMsg = format("Error unique ID: %s", errorUniqueId);
+ String logMsg = errorUniqueId == null ? "Null Error ID" : format("UI Error unique ID: %s", errorUniqueId);
LOG.warn(logMsg, exception);
return response;
diff --git a/smp-webapp/src/main/java/eu/europa/ec/edelivery/smp/error/UIErrorControllerAdvice.java b/smp-webapp/src/main/java/eu/europa/ec/edelivery/smp/error/UIErrorControllerAdvice.java
index b75b90dd6db4321673ad694a1cdb42ebed9debcd..f35922153ba46c95a2c9d333b6cbd37edbbb8174 100644
--- a/smp-webapp/src/main/java/eu/europa/ec/edelivery/smp/error/UIErrorControllerAdvice.java
+++ b/smp-webapp/src/main/java/eu/europa/ec/edelivery/smp/error/UIErrorControllerAdvice.java
@@ -2,15 +2,15 @@
* #START_LICENSE#
* smp-webapp
* %%
- * Copyright (C) 2017 - 2023 European Commission | eDelivery | DomiSMP
+ * Copyright (C) 2017 - 2024 European Commission | eDelivery | DomiSMP
* %%
* Licensed under the EUPL, Version 1.2 or – as soon they will be approved by the European Commission - subsequent
* versions of the EUPL (the "Licence");
* You may not use this work except in compliance with the Licence.
* You may obtain a copy of the Licence at:
- *
+ *
* [PROJECT_HOME]\license\eupl-1.2\license.txt or https://joinup.ec.europa.eu/collection/eupl/eupl-text-eupl-12
- *
+ *
* Unless required by applicable law or agreed to in writing, software distributed under the Licence is
* distributed on an "AS IS" basis, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the Licence for the specific language governing permissions and limitations under the Licence.
@@ -62,7 +62,7 @@ public class UIErrorControllerAdvice extends AbstractErrorControllerAdvice {
.buildJSon();
String errorUniqueId = ((ErrorResponseRO) response.getBody()).getErrorUniqueId();
- String logMsg = format("UI Error unique ID: %s", errorUniqueId);
+ String logMsg = errorUniqueId == null ? "Null Error ID" : format("UI Error unique ID: %s", errorUniqueId);
LOG.warn(logMsg, exception);
return response;
}
diff --git a/smp-webapp/src/main/java/eu/europa/ec/edelivery/smp/error/exceptions/SMPResponseStatusException.java b/smp-webapp/src/main/java/eu/europa/ec/edelivery/smp/error/exceptions/SMPResponseStatusException.java
index 800b31ee410a6e690030d9ad3d3242918b4d45d0..5e553aa1d22d0871fb230bae9af881664cfc4cb4 100644
--- a/smp-webapp/src/main/java/eu/europa/ec/edelivery/smp/error/exceptions/SMPResponseStatusException.java
+++ b/smp-webapp/src/main/java/eu/europa/ec/edelivery/smp/error/exceptions/SMPResponseStatusException.java
@@ -2,7 +2,7 @@
* #START_LICENSE#
* smp-webapp
* %%
- * Copyright (C) 2017 - 2023 European Commission | eDelivery | DomiSMP
+ * Copyright (C) 2017 - 2024 European Commission | eDelivery | DomiSMP
* %%
* Licensed under the EUPL, Version 1.2 or – as soon they will be approved by the European Commission - subsequent
* versions of the EUPL (the "Licence");
diff --git a/smp-webapp/src/main/java/eu/europa/ec/edelivery/smp/error/xml/ErrorResponse.java b/smp-webapp/src/main/java/eu/europa/ec/edelivery/smp/error/xml/ErrorResponse.java
index 588d6d2ff1daa7c9840253c4f93ba16f98d2a88c..561e0ccf05520829bc574d42649e305078c1b716 100644
--- a/smp-webapp/src/main/java/eu/europa/ec/edelivery/smp/error/xml/ErrorResponse.java
+++ b/smp-webapp/src/main/java/eu/europa/ec/edelivery/smp/error/xml/ErrorResponse.java
@@ -2,7 +2,7 @@
* #START_LICENSE#
* smp-webapp
* %%
- * Copyright (C) 2017 - 2023 European Commission | eDelivery | DomiSMP
+ * Copyright (C) 2017 - 2024 European Commission | eDelivery | DomiSMP
* %%
* Licensed under the EUPL, Version 1.2 or – as soon they will be approved by the European Commission - subsequent
* versions of the EUPL (the "Licence");
diff --git a/smp-webapp/src/main/java/eu/europa/ec/edelivery/smp/error/xml/package-info.java b/smp-webapp/src/main/java/eu/europa/ec/edelivery/smp/error/xml/package-info.java
index 089948adeba3ba9d1205f6605d6dcd7b4809034b..c3b86166395bea8ed9e21fef2112ebbb5ac07e48 100644
--- a/smp-webapp/src/main/java/eu/europa/ec/edelivery/smp/error/xml/package-info.java
+++ b/smp-webapp/src/main/java/eu/europa/ec/edelivery/smp/error/xml/package-info.java
@@ -2,7 +2,7 @@
* #START_LICENSE#
* smp-webapp
* %%
- * Copyright (C) 2017 - 2023 European Commission | eDelivery | DomiSMP
+ * Copyright (C) 2017 - 2024 European Commission | eDelivery | DomiSMP
* %%
* Licensed under the EUPL, Version 1.2 or – as soon they will be approved by the European Commission - subsequent
* versions of the EUPL (the "Licence");
diff --git a/smp-webapp/src/main/java/eu/europa/ec/edelivery/smp/filter/Filter.java b/smp-webapp/src/main/java/eu/europa/ec/edelivery/smp/filter/Filter.java
index f3c71839ef0e15259e80dabafe9a2345843b0023..9b4cf85510b3c578425fa9e8cbe31a460026e4f4 100644
--- a/smp-webapp/src/main/java/eu/europa/ec/edelivery/smp/filter/Filter.java
+++ b/smp-webapp/src/main/java/eu/europa/ec/edelivery/smp/filter/Filter.java
@@ -2,7 +2,7 @@
* #START_LICENSE#
* smp-webapp
* %%
- * Copyright (C) 2017 - 2023 European Commission | eDelivery | DomiSMP
+ * Copyright (C) 2017 - 2024 European Commission | eDelivery | DomiSMP
* %%
* Licensed under the EUPL, Version 1.2 or – as soon they will be approved by the European Commission - subsequent
* versions of the EUPL (the "Licence");
diff --git a/smp-webapp/src/main/java/eu/europa/ec/edelivery/smp/filter/FilterHandler.java b/smp-webapp/src/main/java/eu/europa/ec/edelivery/smp/filter/FilterHandler.java
index e87fea783b88b58731829a1ef329319c31264749..9750803ee18819edd4c197df2aacade36870ad06 100644
--- a/smp-webapp/src/main/java/eu/europa/ec/edelivery/smp/filter/FilterHandler.java
+++ b/smp-webapp/src/main/java/eu/europa/ec/edelivery/smp/filter/FilterHandler.java
@@ -2,7 +2,7 @@
* #START_LICENSE#
* smp-webapp
* %%
- * Copyright (C) 2017 - 2023 European Commission | eDelivery | DomiSMP
+ * Copyright (C) 2017 - 2024 European Commission | eDelivery | DomiSMP
* %%
* Licensed under the EUPL, Version 1.2 or – as soon they will be approved by the European Commission - subsequent
* versions of the EUPL (the "Licence");
diff --git a/smp-webapp/src/main/java/eu/europa/ec/edelivery/smp/monitor/MonitorController.java b/smp-webapp/src/main/java/eu/europa/ec/edelivery/smp/monitor/MonitorController.java
index 87f9f1590fd093d6bc600c85404814f777e71518..2fd2c6c25306f91841e8f1f6701b58386238de42 100644
--- a/smp-webapp/src/main/java/eu/europa/ec/edelivery/smp/monitor/MonitorController.java
+++ b/smp-webapp/src/main/java/eu/europa/ec/edelivery/smp/monitor/MonitorController.java
@@ -2,7 +2,7 @@
* #START_LICENSE#
* smp-webapp
* %%
- * Copyright (C) 2017 - 2023 European Commission | eDelivery | DomiSMP
+ * Copyright (C) 2017 - 2024 European Commission | eDelivery | DomiSMP
* %%
* Licensed under the EUPL, Version 1.2 or – as soon they will be approved by the European Commission - subsequent
* versions of the EUPL (the "Licence");
diff --git a/smp-webapp/src/main/java/eu/europa/ec/edelivery/smp/ui/AuthenticationController.java b/smp-webapp/src/main/java/eu/europa/ec/edelivery/smp/ui/AuthenticationController.java
index 2f44e4ab6e0a7b9a74d2af18971ad1af40ab26ce..51230f587d03573942eeae48160d33b3df826979 100644
--- a/smp-webapp/src/main/java/eu/europa/ec/edelivery/smp/ui/AuthenticationController.java
+++ b/smp-webapp/src/main/java/eu/europa/ec/edelivery/smp/ui/AuthenticationController.java
@@ -2,7 +2,7 @@
* #START_LICENSE#
* smp-webapp
* %%
- * Copyright (C) 2017 - 2023 European Commission | eDelivery | DomiSMP
+ * Copyright (C) 2017 - 2024 European Commission | eDelivery | DomiSMP
* %%
* Licensed under the EUPL, Version 1.2 or – as soon they will be approved by the European Commission - subsequent
* versions of the EUPL (the "Licence");
diff --git a/smp-webapp/src/main/java/eu/europa/ec/edelivery/smp/ui/ResourceConstants.java b/smp-webapp/src/main/java/eu/europa/ec/edelivery/smp/ui/ResourceConstants.java
index 69e900415da0f072f0ec599228f2b2b89aef0300..c4489c534848d7ca3bf103b65ea2567a3ae5c94c 100644
--- a/smp-webapp/src/main/java/eu/europa/ec/edelivery/smp/ui/ResourceConstants.java
+++ b/smp-webapp/src/main/java/eu/europa/ec/edelivery/smp/ui/ResourceConstants.java
@@ -2,7 +2,7 @@
* #START_LICENSE#
* smp-webapp
* %%
- * Copyright (C) 2017 - 2023 European Commission | eDelivery | DomiSMP
+ * Copyright (C) 2017 - 2024 European Commission | eDelivery | DomiSMP
* %%
* Licensed under the EUPL, Version 1.2 or – as soon they will be approved by the European Commission - subsequent
* versions of the EUPL (the "Licence");
diff --git a/smp-webapp/src/main/java/eu/europa/ec/edelivery/smp/ui/edit/DocumentEditController.java b/smp-webapp/src/main/java/eu/europa/ec/edelivery/smp/ui/edit/DocumentEditController.java
index 875afcc7090ea086b3b436fc02edbac2e9280345..a156d171fd54cfe08db5918115878f6b96ca6bd5 100644
--- a/smp-webapp/src/main/java/eu/europa/ec/edelivery/smp/ui/edit/DocumentEditController.java
+++ b/smp-webapp/src/main/java/eu/europa/ec/edelivery/smp/ui/edit/DocumentEditController.java
@@ -2,7 +2,7 @@
* #START_LICENSE#
* smp-webapp
* %%
- * Copyright (C) 2017 - 2023 European Commission | eDelivery | DomiSMP
+ * Copyright (C) 2017 - 2024 European Commission | eDelivery | DomiSMP
* %%
* Licensed under the EUPL, Version 1.2 or – as soon they will be approved by the European Commission - subsequent
* versions of the EUPL (the "Licence");
diff --git a/smp-webapp/src/main/java/eu/europa/ec/edelivery/smp/ui/edit/DomainEditController.java b/smp-webapp/src/main/java/eu/europa/ec/edelivery/smp/ui/edit/DomainEditController.java
index 45583d315c9ed709ccacc40468da2e7d6638e1d1..fa9cf9c35e386a66a434c48323c789e93bc13fae 100644
--- a/smp-webapp/src/main/java/eu/europa/ec/edelivery/smp/ui/edit/DomainEditController.java
+++ b/smp-webapp/src/main/java/eu/europa/ec/edelivery/smp/ui/edit/DomainEditController.java
@@ -2,7 +2,7 @@
* #START_LICENSE#
* smp-webapp
* %%
- * Copyright (C) 2017 - 2023 European Commission | eDelivery | DomiSMP
+ * Copyright (C) 2017 - 2024 European Commission | eDelivery | DomiSMP
* %%
* Licensed under the EUPL, Version 1.2 or – as soon they will be approved by the European Commission - subsequent
* versions of the EUPL (the "Licence");
diff --git a/smp-webapp/src/main/java/eu/europa/ec/edelivery/smp/ui/edit/GroupEditController.java b/smp-webapp/src/main/java/eu/europa/ec/edelivery/smp/ui/edit/GroupEditController.java
index 8dd9011a3fd6c2ebd60921a72cfb514a37efd12b..4360a4d77e93cbf625bd4c96ae62e8f157276cd7 100644
--- a/smp-webapp/src/main/java/eu/europa/ec/edelivery/smp/ui/edit/GroupEditController.java
+++ b/smp-webapp/src/main/java/eu/europa/ec/edelivery/smp/ui/edit/GroupEditController.java
@@ -2,7 +2,7 @@
* #START_LICENSE#
* smp-webapp
* %%
- * Copyright (C) 2017 - 2023 European Commission | eDelivery | DomiSMP
+ * Copyright (C) 2017 - 2024 European Commission | eDelivery | DomiSMP
* %%
* Licensed under the EUPL, Version 1.2 or – as soon they will be approved by the European Commission - subsequent
* versions of the EUPL (the "Licence");
diff --git a/smp-webapp/src/main/java/eu/europa/ec/edelivery/smp/ui/edit/ResourceEditController.java b/smp-webapp/src/main/java/eu/europa/ec/edelivery/smp/ui/edit/ResourceEditController.java
index 4b4e23c47f49cd150e8d5f6d0776e5a7ddec1eb1..0ca1c4e82dfac32281cebb572ffff4a36dab8a31 100644
--- a/smp-webapp/src/main/java/eu/europa/ec/edelivery/smp/ui/edit/ResourceEditController.java
+++ b/smp-webapp/src/main/java/eu/europa/ec/edelivery/smp/ui/edit/ResourceEditController.java
@@ -2,7 +2,7 @@
* #START_LICENSE#
* smp-webapp
* %%
- * Copyright (C) 2017 - 2023 European Commission | eDelivery | DomiSMP
+ * Copyright (C) 2017 - 2024 European Commission | eDelivery | DomiSMP
* %%
* Licensed under the EUPL, Version 1.2 or – as soon they will be approved by the European Commission - subsequent
* versions of the EUPL (the "Licence");
diff --git a/smp-webapp/src/main/java/eu/europa/ec/edelivery/smp/ui/edit/SubresourceEditController.java b/smp-webapp/src/main/java/eu/europa/ec/edelivery/smp/ui/edit/SubresourceEditController.java
index dbab625fb1ae5367886827e0c20914781e8a63a6..11fe10e692522e4cc220094d5e503a1ff4c9d6cb 100644
--- a/smp-webapp/src/main/java/eu/europa/ec/edelivery/smp/ui/edit/SubresourceEditController.java
+++ b/smp-webapp/src/main/java/eu/europa/ec/edelivery/smp/ui/edit/SubresourceEditController.java
@@ -2,7 +2,7 @@
* #START_LICENSE#
* smp-webapp
* %%
- * Copyright (C) 2017 - 2023 European Commission | eDelivery | DomiSMP
+ * Copyright (C) 2017 - 2024 European Commission | eDelivery | DomiSMP
* %%
* Licensed under the EUPL, Version 1.2 or – as soon they will be approved by the European Commission - subsequent
* versions of the EUPL (the "Licence");
diff --git a/smp-webapp/src/main/java/eu/europa/ec/edelivery/smp/ui/external/ApplicationController.java b/smp-webapp/src/main/java/eu/europa/ec/edelivery/smp/ui/external/ApplicationController.java
index 4e4e7e3898c49ba2a23e7dd135a7512f49e5fd50..f4ea74c05c1e323bd9e2b90ff127ba32d58e496a 100644
--- a/smp-webapp/src/main/java/eu/europa/ec/edelivery/smp/ui/external/ApplicationController.java
+++ b/smp-webapp/src/main/java/eu/europa/ec/edelivery/smp/ui/external/ApplicationController.java
@@ -2,7 +2,7 @@
* #START_LICENSE#
* smp-webapp
* %%
- * Copyright (C) 2017 - 2023 European Commission | eDelivery | DomiSMP
+ * Copyright (C) 2017 - 2024 European Commission | eDelivery | DomiSMP
* %%
* Licensed under the EUPL, Version 1.2 or – as soon they will be approved by the European Commission - subsequent
* versions of the EUPL (the "Licence");
diff --git a/smp-webapp/src/main/java/eu/europa/ec/edelivery/smp/ui/external/DomainController.java b/smp-webapp/src/main/java/eu/europa/ec/edelivery/smp/ui/external/DomainController.java
index befccb55328be20f10887237189c7840ec5afa2f..9fb93f94cdbba2660e4375e39a5045392cb23864 100644
--- a/smp-webapp/src/main/java/eu/europa/ec/edelivery/smp/ui/external/DomainController.java
+++ b/smp-webapp/src/main/java/eu/europa/ec/edelivery/smp/ui/external/DomainController.java
@@ -2,7 +2,7 @@
* #START_LICENSE#
* smp-webapp
* %%
- * Copyright (C) 2017 - 2023 European Commission | eDelivery | DomiSMP
+ * Copyright (C) 2017 - 2024 European Commission | eDelivery | DomiSMP
* %%
* Licensed under the EUPL, Version 1.2 or – as soon they will be approved by the European Commission - subsequent
* versions of the EUPL (the "Licence");
diff --git a/smp-webapp/src/main/java/eu/europa/ec/edelivery/smp/ui/external/SearchResource.java b/smp-webapp/src/main/java/eu/europa/ec/edelivery/smp/ui/external/SearchResource.java
index eb8932bb805495df03eef1dc7f7b79297d7f54bf..b53cddeacf4c9de485b77740a5fa6ff35384028b 100644
--- a/smp-webapp/src/main/java/eu/europa/ec/edelivery/smp/ui/external/SearchResource.java
+++ b/smp-webapp/src/main/java/eu/europa/ec/edelivery/smp/ui/external/SearchResource.java
@@ -2,7 +2,7 @@
* #START_LICENSE#
* smp-webapp
* %%
- * Copyright (C) 2017 - 2023 European Commission | eDelivery | DomiSMP
+ * Copyright (C) 2017 - 2024 European Commission | eDelivery | DomiSMP
* %%
* Licensed under the EUPL, Version 1.2 or – as soon they will be approved by the European Commission - subsequent
* versions of the EUPL (the "Licence");
diff --git a/smp-webapp/src/main/java/eu/europa/ec/edelivery/smp/ui/external/TruststoreController.java b/smp-webapp/src/main/java/eu/europa/ec/edelivery/smp/ui/external/TruststoreController.java
index 3039753f7b0552c6b33c8d7810767c932da782ed..5313efb19723910feae0f1e1dd9eaa596ee7a920 100644
--- a/smp-webapp/src/main/java/eu/europa/ec/edelivery/smp/ui/external/TruststoreController.java
+++ b/smp-webapp/src/main/java/eu/europa/ec/edelivery/smp/ui/external/TruststoreController.java
@@ -2,7 +2,7 @@
* #START_LICENSE#
* smp-webapp
* %%
- * Copyright (C) 2017 - 2023 European Commission | eDelivery | DomiSMP
+ * Copyright (C) 2017 - 2024 European Commission | eDelivery | DomiSMP
* %%
* Licensed under the EUPL, Version 1.2 or – as soon they will be approved by the European Commission - subsequent
* versions of the EUPL (the "Licence");
diff --git a/smp-webapp/src/main/java/eu/europa/ec/edelivery/smp/ui/external/UserController.java b/smp-webapp/src/main/java/eu/europa/ec/edelivery/smp/ui/external/UserController.java
index 9213164a180971b1acebc562664525c6b046c5cd..df9891e3b3c2aadbd0a18958dd6b8defc29c0ff3 100644
--- a/smp-webapp/src/main/java/eu/europa/ec/edelivery/smp/ui/external/UserController.java
+++ b/smp-webapp/src/main/java/eu/europa/ec/edelivery/smp/ui/external/UserController.java
@@ -2,7 +2,7 @@
* #START_LICENSE#
* smp-webapp
* %%
- * Copyright (C) 2017 - 2023 European Commission | eDelivery | DomiSMP
+ * Copyright (C) 2017 - 2024 European Commission | eDelivery | DomiSMP
* %%
* Licensed under the EUPL, Version 1.2 or – as soon they will be approved by the European Commission - subsequent
* versions of the EUPL (the "Licence");
diff --git a/smp-webapp/src/main/java/eu/europa/ec/edelivery/smp/ui/internal/AlertController.java b/smp-webapp/src/main/java/eu/europa/ec/edelivery/smp/ui/internal/AlertController.java
index b3ae7053b118fde6617ace93cf2ea1f0f9cb4572..4e7b8440fd20c8410ff5cb2b7db471c31d4119cb 100644
--- a/smp-webapp/src/main/java/eu/europa/ec/edelivery/smp/ui/internal/AlertController.java
+++ b/smp-webapp/src/main/java/eu/europa/ec/edelivery/smp/ui/internal/AlertController.java
@@ -2,7 +2,7 @@
* #START_LICENSE#
* smp-webapp
* %%
- * Copyright (C) 2017 - 2023 European Commission | eDelivery | DomiSMP
+ * Copyright (C) 2017 - 2024 European Commission | eDelivery | DomiSMP
* %%
* Licensed under the EUPL, Version 1.2 or – as soon they will be approved by the European Commission - subsequent
* versions of the EUPL (the "Licence");
diff --git a/smp-webapp/src/main/java/eu/europa/ec/edelivery/smp/ui/internal/DomainAdminController.java b/smp-webapp/src/main/java/eu/europa/ec/edelivery/smp/ui/internal/DomainAdminController.java
index 1c5cd50a86cc5f133818a35b4c8aa331f99f164f..c9253e929e038745b4c3ada3a7a33a2802a283ee 100644
--- a/smp-webapp/src/main/java/eu/europa/ec/edelivery/smp/ui/internal/DomainAdminController.java
+++ b/smp-webapp/src/main/java/eu/europa/ec/edelivery/smp/ui/internal/DomainAdminController.java
@@ -2,7 +2,7 @@
* #START_LICENSE#
* smp-webapp
* %%
- * Copyright (C) 2017 - 2023 European Commission | eDelivery | DomiSMP
+ * Copyright (C) 2017 - 2024 European Commission | eDelivery | DomiSMP
* %%
* Licensed under the EUPL, Version 1.2 or – as soon they will be approved by the European Commission - subsequent
* versions of the EUPL (the "Licence");
diff --git a/smp-webapp/src/main/java/eu/europa/ec/edelivery/smp/ui/internal/ExtensionAdminController.java b/smp-webapp/src/main/java/eu/europa/ec/edelivery/smp/ui/internal/ExtensionAdminController.java
index 3e6564d866ae93205f2911ffd319c80e44481e95..5099a2062d54485caa55cd9429c1ec5210b07b11 100644
--- a/smp-webapp/src/main/java/eu/europa/ec/edelivery/smp/ui/internal/ExtensionAdminController.java
+++ b/smp-webapp/src/main/java/eu/europa/ec/edelivery/smp/ui/internal/ExtensionAdminController.java
@@ -2,7 +2,7 @@
* #START_LICENSE#
* smp-webapp
* %%
- * Copyright (C) 2017 - 2023 European Commission | eDelivery | DomiSMP
+ * Copyright (C) 2017 - 2024 European Commission | eDelivery | DomiSMP
* %%
* Licensed under the EUPL, Version 1.2 or – as soon they will be approved by the European Commission - subsequent
* versions of the EUPL (the "Licence");
diff --git a/smp-webapp/src/main/java/eu/europa/ec/edelivery/smp/ui/internal/KeystoreAdminController.java b/smp-webapp/src/main/java/eu/europa/ec/edelivery/smp/ui/internal/KeystoreAdminController.java
index 0c03e7d52638ec2dadd1b8c57d823a32fe8148e7..3b8c7a0613d79139c1ebb227f39c4db172b41352 100644
--- a/smp-webapp/src/main/java/eu/europa/ec/edelivery/smp/ui/internal/KeystoreAdminController.java
+++ b/smp-webapp/src/main/java/eu/europa/ec/edelivery/smp/ui/internal/KeystoreAdminController.java
@@ -2,7 +2,7 @@
* #START_LICENSE#
* smp-webapp
* %%
- * Copyright (C) 2017 - 2023 European Commission | eDelivery | DomiSMP
+ * Copyright (C) 2017 - 2024 European Commission | eDelivery | DomiSMP
* %%
* Licensed under the EUPL, Version 1.2 or – as soon they will be approved by the European Commission - subsequent
* versions of the EUPL (the "Licence");
diff --git a/smp-webapp/src/main/java/eu/europa/ec/edelivery/smp/ui/internal/PropertyController.java b/smp-webapp/src/main/java/eu/europa/ec/edelivery/smp/ui/internal/PropertyController.java
index 2b570f4e52830dd3f2483de858a2acf051a374e5..2a5d1981e69b2c5c343fd27d9e4e71db7c6b9dd5 100644
--- a/smp-webapp/src/main/java/eu/europa/ec/edelivery/smp/ui/internal/PropertyController.java
+++ b/smp-webapp/src/main/java/eu/europa/ec/edelivery/smp/ui/internal/PropertyController.java
@@ -2,7 +2,7 @@
* #START_LICENSE#
* smp-webapp
* %%
- * Copyright (C) 2017 - 2023 European Commission | eDelivery | DomiSMP
+ * Copyright (C) 2017 - 2024 European Commission | eDelivery | DomiSMP
* %%
* Licensed under the EUPL, Version 1.2 or – as soon they will be approved by the European Commission - subsequent
* versions of the EUPL (the "Licence");
diff --git a/smp-webapp/src/main/java/eu/europa/ec/edelivery/smp/ui/internal/TruststoreAdminController.java b/smp-webapp/src/main/java/eu/europa/ec/edelivery/smp/ui/internal/TruststoreAdminController.java
index 81c8cb446d0a5aeff9dfac65e03c3c6c7d2326de..88cfc2ad9af636dc8be99ee431496705770ce545 100644
--- a/smp-webapp/src/main/java/eu/europa/ec/edelivery/smp/ui/internal/TruststoreAdminController.java
+++ b/smp-webapp/src/main/java/eu/europa/ec/edelivery/smp/ui/internal/TruststoreAdminController.java
@@ -2,7 +2,7 @@
* #START_LICENSE#
* smp-webapp
* %%
- * Copyright (C) 2017 - 2023 European Commission | eDelivery | DomiSMP
+ * Copyright (C) 2017 - 2024 European Commission | eDelivery | DomiSMP
* %%
* Licensed under the EUPL, Version 1.2 or – as soon they will be approved by the European Commission - subsequent
* versions of the EUPL (the "Licence");
diff --git a/smp-webapp/src/main/java/eu/europa/ec/edelivery/smp/ui/internal/UserAdminController.java b/smp-webapp/src/main/java/eu/europa/ec/edelivery/smp/ui/internal/UserAdminController.java
index 6699cf9e9ed3570c458b345a78a0e0dff03f611b..4320a8f30985dd061aa20fc65bb93d3cacea7b14 100644
--- a/smp-webapp/src/main/java/eu/europa/ec/edelivery/smp/ui/internal/UserAdminController.java
+++ b/smp-webapp/src/main/java/eu/europa/ec/edelivery/smp/ui/internal/UserAdminController.java
@@ -2,7 +2,7 @@
* #START_LICENSE#
* smp-webapp
* %%
- * Copyright (C) 2017 - 2023 European Commission | eDelivery | DomiSMP
+ * Copyright (C) 2017 - 2024 European Commission | eDelivery | DomiSMP
* %%
* Licensed under the EUPL, Version 1.2 or – as soon they will be approved by the European Commission - subsequent
* versions of the EUPL (the "Licence");
diff --git a/smp-webapp/src/main/resources/application.properties b/smp-webapp/src/main/resources/application.properties
index 285a73bd37ce5933b13c8eadabbe1fd189468be4..40401056b7c49a34b71afd764bec06ffdfbbd00a 100644
--- a/smp-webapp/src/main/resources/application.properties
+++ b/smp-webapp/src/main/resources/application.properties
@@ -2,7 +2,7 @@
# #START_LICENSE#
# smp-webapp
# %%
-# Copyright (C) 2017 - 2023 European Commission | eDelivery | DomiSMP
+# Copyright (C) 2017 - 2024 European Commission | eDelivery | DomiSMP
# %%
# Licensed under the EUPL, Version 1.2 or – as soon they will be approved by the European Commission - subsequent
# versions of the EUPL (the "Licence");
diff --git a/smp-webapp/src/main/resources/html/index.html b/smp-webapp/src/main/resources/html/index.html
index 07fa392abe338a1e1e60863007a3106428d98806..62f2af7c2148a06e41d403c4d4e6450c8bbedc73 100644
--- a/smp-webapp/src/main/resources/html/index.html
+++ b/smp-webapp/src/main/resources/html/index.html
@@ -3,7 +3,7 @@
#START_LICENSE#
smp-webapp
%%
- Copyright (C) 2017 - 2023 European Commission | eDelivery | DomiSMP
+ Copyright (C) 2017 - 2024 European Commission | eDelivery | DomiSMP
%%
Licensed under the EUPL, Version 1.2 or – as soon they will be approved by the European Commission - subsequent
versions of the EUPL (the "Licence");
diff --git a/smp-webapp/src/main/resources/isAliveTestFiles/ServiceGroupTest.xml b/smp-webapp/src/main/resources/isAliveTestFiles/ServiceGroupTest.xml
index 7345c7c60516d2be0cee7e413c1ba55f9dad69e1..0d14396c6fd223b59622f43e132c3eb4e4cd4a02 100644
--- a/smp-webapp/src/main/resources/isAliveTestFiles/ServiceGroupTest.xml
+++ b/smp-webapp/src/main/resources/isAliveTestFiles/ServiceGroupTest.xml
@@ -3,7 +3,7 @@
#START_LICENSE#
smp-webapp
%%
- Copyright (C) 2017 - 2023 European Commission | eDelivery | DomiSMP
+ Copyright (C) 2017 - 2024 European Commission | eDelivery | DomiSMP
%%
Licensed under the EUPL, Version 1.2 or – as soon they will be approved by the European Commission - subsequent
versions of the EUPL (the "Licence");
diff --git a/smp-webapp/src/main/resources/logback.xml b/smp-webapp/src/main/resources/logback.xml
index bc768b4a533caf0dda5583fe565f5ece62d0796a..cc003efa1f83b51844d6ef8ebb7a84dc58264a55 100644
--- a/smp-webapp/src/main/resources/logback.xml
+++ b/smp-webapp/src/main/resources/logback.xml
@@ -3,7 +3,7 @@
#START_LICENSE#
smp-webapp
%%
- Copyright (C) 2017 - 2023 European Commission | eDelivery | DomiSMP
+ Copyright (C) 2017 - 2024 European Commission | eDelivery | DomiSMP
%%
Licensed under the EUPL, Version 1.2 or – as soon they will be approved by the European Commission - subsequent
versions of the EUPL (the "Licence");
diff --git a/smp-webapp/src/main/smp-setup/SMP-samples-soapui-project.xml b/smp-webapp/src/main/smp-setup/SMP-samples-soapui-project.xml
index cc05f7bc4acabce9331f5d017624d0125125501a..fd5617dd7bbf8f2a35dd6cc32211407f26d1e8f2 100644
--- a/smp-webapp/src/main/smp-setup/SMP-samples-soapui-project.xml
+++ b/smp-webapp/src/main/smp-setup/SMP-samples-soapui-project.xml
@@ -3,7 +3,7 @@
#START_LICENSE#
smp-webapp
%%
- Copyright (C) 2017 - 2023 European Commission | eDelivery | DomiSMP
+ Copyright (C) 2017 - 2024 European Commission | eDelivery | DomiSMP
%%
Licensed under the EUPL, Version 1.2 or – as soon they will be approved by the European Commission - subsequent
versions of the EUPL (the "Licence");
diff --git a/smp-webapp/src/main/smp-setup/smp-logback.xml b/smp-webapp/src/main/smp-setup/smp-logback.xml
index 69376cda7ecb36c31615781c60ec73c5b91f1093..543e3689ad4f42286105212e7a5056bc46433a45 100644
--- a/smp-webapp/src/main/smp-setup/smp-logback.xml
+++ b/smp-webapp/src/main/smp-setup/smp-logback.xml
@@ -3,7 +3,7 @@
#START_LICENSE#
smp-webapp
%%
- Copyright (C) 2017 - 2023 European Commission | eDelivery | DomiSMP
+ Copyright (C) 2017 - 2024 European Commission | eDelivery | DomiSMP
%%
Licensed under the EUPL, Version 1.2 or – as soon they will be approved by the European Commission - subsequent
versions of the EUPL (the "Licence");
diff --git a/smp-webapp/src/main/smp-setup/smp-setup.xml b/smp-webapp/src/main/smp-setup/smp-setup.xml
index cf71e1cada01acb7675c47d7f121d28ce31981ae..45b9715db6b713062e884ba7cc115b101f843212 100644
--- a/smp-webapp/src/main/smp-setup/smp-setup.xml
+++ b/smp-webapp/src/main/smp-setup/smp-setup.xml
@@ -2,7 +2,7 @@
#START_LICENSE#
smp-webapp
%%
- Copyright (C) 2017 - 2023 European Commission | eDelivery | DomiSMP
+ Copyright (C) 2017 - 2024 European Commission | eDelivery | DomiSMP
%%
Licensed under the EUPL, Version 1.2 or – as soon they will be approved by the European Commission - subsequent
versions of the EUPL (the "Licence");
diff --git a/smp-webapp/src/main/smp-setup/smp.config.properties b/smp-webapp/src/main/smp-setup/smp.config.properties
index 89ccb36caf716f11cbebfa4a09f6ddd9a46b25b1..356e5937b71838ac4a746d69c28785c21616aca7 100644
--- a/smp-webapp/src/main/smp-setup/smp.config.properties
+++ b/smp-webapp/src/main/smp-setup/smp.config.properties
@@ -2,7 +2,7 @@
# #START_LICENSE#
# smp-webapp
# %%
-# Copyright (C) 2017 - 2023 European Commission | eDelivery | DomiSMP
+# Copyright (C) 2017 - 2024 European Commission | eDelivery | DomiSMP
# %%
# Licensed under the EUPL, Version 1.2 or – as soon they will be approved by the European Commission - subsequent
# versions of the EUPL (the "Licence");
diff --git a/smp-webapp/src/main/webapp/WEB-INF/web.xml b/smp-webapp/src/main/webapp/WEB-INF/web.xml
index 928c66566c19da88521c3217245e20ff5f3fcdf2..00e7881e1d6c762ef63b0da20a786c3b5703b9ce 100644
--- a/smp-webapp/src/main/webapp/WEB-INF/web.xml
+++ b/smp-webapp/src/main/webapp/WEB-INF/web.xml
@@ -3,7 +3,7 @@
#START_LICENSE#
smp-webapp
%%
- Copyright (C) 2017 - 2023 European Commission | eDelivery | DomiSMP
+ Copyright (C) 2017 - 2024 European Commission | eDelivery | DomiSMP
%%
Licensed under the EUPL, Version 1.2 or – as soon they will be approved by the European Commission - subsequent
versions of the EUPL (the "Licence");
diff --git a/smp-webapp/src/main/webapp/WEB-INF/weblogic.xml b/smp-webapp/src/main/webapp/WEB-INF/weblogic.xml
index 2fe8e9902859c85940896ee31f81d886295be332..6ac1d7bfbcf7c93be329ff50517d287ba73be9d7 100644
--- a/smp-webapp/src/main/webapp/WEB-INF/weblogic.xml
+++ b/smp-webapp/src/main/webapp/WEB-INF/weblogic.xml
@@ -3,7 +3,7 @@
#START_LICENSE#
smp-webapp
%%
- Copyright (C) 2017 - 2023 European Commission | eDelivery | DomiSMP
+ Copyright (C) 2017 - 2024 European Commission | eDelivery | DomiSMP
%%
Licensed under the EUPL, Version 1.2 or – as soon they will be approved by the European Commission - subsequent
versions of the EUPL (the "Licence");
diff --git a/smp-webapp/src/test/java/eu/europa/ec/edelivery/smp/AbstractTest.java b/smp-webapp/src/test/java/eu/europa/ec/edelivery/smp/AbstractTest.java
index fc42e9b9f3211bbccbd0dd18f8b7c73dc932ddd5..426ba3372161bb662de9c5bada187197fdceb499 100644
--- a/smp-webapp/src/test/java/eu/europa/ec/edelivery/smp/AbstractTest.java
+++ b/smp-webapp/src/test/java/eu/europa/ec/edelivery/smp/AbstractTest.java
@@ -2,7 +2,7 @@
* #START_LICENSE#
* smp-webapp
* %%
- * Copyright (C) 2017 - 2023 European Commission | eDelivery | DomiSMP
+ * Copyright (C) 2017 - 2024 European Commission | eDelivery | DomiSMP
* %%
* Licensed under the EUPL, Version 1.2 or – as soon they will be approved by the European Commission - subsequent
* versions of the EUPL (the "Licence");
diff --git a/smp-webapp/src/test/java/eu/europa/ec/edelivery/smp/ServiceGroupBodyUtil.java b/smp-webapp/src/test/java/eu/europa/ec/edelivery/smp/ServiceGroupBodyUtil.java
index 5c46bacdbc6cef2f01231f609d3cff482e7a9794..5e0ef410466691acd956c15c8457221458187a17 100644
--- a/smp-webapp/src/test/java/eu/europa/ec/edelivery/smp/ServiceGroupBodyUtil.java
+++ b/smp-webapp/src/test/java/eu/europa/ec/edelivery/smp/ServiceGroupBodyUtil.java
@@ -2,7 +2,7 @@
* #START_LICENSE#
* smp-webapp
* %%
- * Copyright (C) 2017 - 2023 European Commission | eDelivery | DomiSMP
+ * Copyright (C) 2017 - 2024 European Commission | eDelivery | DomiSMP
* %%
* Licensed under the EUPL, Version 1.2 or – as soon they will be approved by the European Commission - subsequent
* versions of the EUPL (the "Licence");
diff --git a/smp-webapp/src/test/java/eu/europa/ec/edelivery/smp/auth/SMPAuthenticationEventListenerTest.java b/smp-webapp/src/test/java/eu/europa/ec/edelivery/smp/auth/SMPAuthenticationEventListenerTest.java
index 46e7dec51a0738b18276699af1340888ac5509c6..c5e4f888159e196806acaf28304845b26edc558a 100644
--- a/smp-webapp/src/test/java/eu/europa/ec/edelivery/smp/auth/SMPAuthenticationEventListenerTest.java
+++ b/smp-webapp/src/test/java/eu/europa/ec/edelivery/smp/auth/SMPAuthenticationEventListenerTest.java
@@ -2,7 +2,7 @@
* #START_LICENSE#
* smp-webapp
* %%
- * Copyright (C) 2017 - 2023 European Commission | eDelivery | DomiSMP
+ * Copyright (C) 2017 - 2024 European Commission | eDelivery | DomiSMP
* %%
* Licensed under the EUPL, Version 1.2 or – as soon they will be approved by the European Commission - subsequent
* versions of the EUPL (the "Licence");
diff --git a/smp-webapp/src/test/java/eu/europa/ec/edelivery/smp/auth/SMPAuthenticationProviderTest.java b/smp-webapp/src/test/java/eu/europa/ec/edelivery/smp/auth/SMPAuthenticationProviderTest.java
index 4f2668693622c363881e9bdea385588dbb34bbf4..e04977a010fc0e119c6993861f0080351e01ccd3 100644
--- a/smp-webapp/src/test/java/eu/europa/ec/edelivery/smp/auth/SMPAuthenticationProviderTest.java
+++ b/smp-webapp/src/test/java/eu/europa/ec/edelivery/smp/auth/SMPAuthenticationProviderTest.java
@@ -2,7 +2,7 @@
* #START_LICENSE#
* smp-webapp
* %%
- * Copyright (C) 2017 - 2023 European Commission | eDelivery | DomiSMP
+ * Copyright (C) 2017 - 2024 European Commission | eDelivery | DomiSMP
* %%
* Licensed under the EUPL, Version 1.2 or – as soon they will be approved by the European Commission - subsequent
* versions of the EUPL (the "Licence");
diff --git a/smp-webapp/src/test/java/eu/europa/ec/edelivery/smp/auth/SMPAuthorizationServiceTest.java b/smp-webapp/src/test/java/eu/europa/ec/edelivery/smp/auth/SMPAuthorizationServiceTest.java
index 363a48a4608d7ecea2c1c12d9db40b6603d73c04..ac8fe3e3a692d95b77d01acc2daa06e4c7d2dd40 100644
--- a/smp-webapp/src/test/java/eu/europa/ec/edelivery/smp/auth/SMPAuthorizationServiceTest.java
+++ b/smp-webapp/src/test/java/eu/europa/ec/edelivery/smp/auth/SMPAuthorizationServiceTest.java
@@ -2,7 +2,7 @@
* #START_LICENSE#
* smp-webapp
* %%
- * Copyright (C) 2017 - 2023 European Commission | eDelivery | DomiSMP
+ * Copyright (C) 2017 - 2024 European Commission | eDelivery | DomiSMP
* %%
* Licensed under the EUPL, Version 1.2 or – as soon they will be approved by the European Commission - subsequent
* versions of the EUPL (the "Licence");
diff --git a/smp-webapp/src/test/java/eu/europa/ec/edelivery/smp/auth/URLCsrfMatcherTest.java b/smp-webapp/src/test/java/eu/europa/ec/edelivery/smp/auth/URLCsrfMatcherTest.java
index 5bc51f231dea190becdd159722180eef5cabb421..3e8cb881b521876942d73f9a918fb413b6920c1b 100644
--- a/smp-webapp/src/test/java/eu/europa/ec/edelivery/smp/auth/URLCsrfMatcherTest.java
+++ b/smp-webapp/src/test/java/eu/europa/ec/edelivery/smp/auth/URLCsrfMatcherTest.java
@@ -2,7 +2,7 @@
* #START_LICENSE#
* smp-webapp
* %%
- * Copyright (C) 2017 - 2023 European Commission | eDelivery | DomiSMP
+ * Copyright (C) 2017 - 2024 European Commission | eDelivery | DomiSMP
* %%
* Licensed under the EUPL, Version 1.2 or – as soon they will be approved by the European Commission - subsequent
* versions of the EUPL (the "Licence");
diff --git a/smp-webapp/src/test/java/eu/europa/ec/edelivery/smp/auth/cas/SMPCas20ServiceTicketValidatorTest.java b/smp-webapp/src/test/java/eu/europa/ec/edelivery/smp/auth/cas/SMPCas20ServiceTicketValidatorTest.java
index ed4e89c035aee2429e69965c9d2ecb1f6c843305..cdcdb0aee9b068986ca276c47a82f701bd888f72 100644
--- a/smp-webapp/src/test/java/eu/europa/ec/edelivery/smp/auth/cas/SMPCas20ServiceTicketValidatorTest.java
+++ b/smp-webapp/src/test/java/eu/europa/ec/edelivery/smp/auth/cas/SMPCas20ServiceTicketValidatorTest.java
@@ -2,7 +2,7 @@
* #START_LICENSE#
* smp-webapp
* %%
- * Copyright (C) 2017 - 2023 European Commission | eDelivery | DomiSMP
+ * Copyright (C) 2017 - 2024 European Commission | eDelivery | DomiSMP
* %%
* Licensed under the EUPL, Version 1.2 or – as soon they will be approved by the European Commission - subsequent
* versions of the EUPL (the "Licence");
diff --git a/smp-webapp/src/test/java/eu/europa/ec/edelivery/smp/auth/cas/SMPCasConfigurerTest.java b/smp-webapp/src/test/java/eu/europa/ec/edelivery/smp/auth/cas/SMPCasConfigurerTest.java
index 7cd8a714c5bc907264c60ab179b271cf574ffeed..f164541de45f33cb2df14fc1153b79bba078c032 100644
--- a/smp-webapp/src/test/java/eu/europa/ec/edelivery/smp/auth/cas/SMPCasConfigurerTest.java
+++ b/smp-webapp/src/test/java/eu/europa/ec/edelivery/smp/auth/cas/SMPCasConfigurerTest.java
@@ -2,7 +2,7 @@
* #START_LICENSE#
* smp-webapp
* %%
- * Copyright (C) 2017 - 2023 European Commission | eDelivery | DomiSMP
+ * Copyright (C) 2017 - 2024 European Commission | eDelivery | DomiSMP
* %%
* Licensed under the EUPL, Version 1.2 or – as soon they will be approved by the European Commission - subsequent
* versions of the EUPL (the "Licence");
diff --git a/smp-webapp/src/test/java/eu/europa/ec/edelivery/smp/config/SMPMailPropertyUpdateListenerTest.java b/smp-webapp/src/test/java/eu/europa/ec/edelivery/smp/config/SMPMailPropertyUpdateListenerTest.java
index 364801ef51b01ae779849f1042a98475a022a6e5..e713ae9db46c25b7d5c778378449f4ad84a471d6 100644
--- a/smp-webapp/src/test/java/eu/europa/ec/edelivery/smp/config/SMPMailPropertyUpdateListenerTest.java
+++ b/smp-webapp/src/test/java/eu/europa/ec/edelivery/smp/config/SMPMailPropertyUpdateListenerTest.java
@@ -2,7 +2,7 @@
* #START_LICENSE#
* smp-webapp
* %%
- * Copyright (C) 2017 - 2023 European Commission | eDelivery | DomiSMP
+ * Copyright (C) 2017 - 2024 European Commission | eDelivery | DomiSMP
* %%
* Licensed under the EUPL, Version 1.2 or – as soon they will be approved by the European Commission - subsequent
* versions of the EUPL (the "Licence");
diff --git a/smp-webapp/src/test/java/eu/europa/ec/edelivery/smp/config/SMPSecurityPropertyUpdateListenerTest.java b/smp-webapp/src/test/java/eu/europa/ec/edelivery/smp/config/SMPSecurityPropertyUpdateListenerTest.java
index d97c261e8cd233253fc251e83d7e496fcf381cb6..b012ab861e0de714e028729ba7b2827fa0d1ba3c 100644
--- a/smp-webapp/src/test/java/eu/europa/ec/edelivery/smp/config/SMPSecurityPropertyUpdateListenerTest.java
+++ b/smp-webapp/src/test/java/eu/europa/ec/edelivery/smp/config/SMPSecurityPropertyUpdateListenerTest.java
@@ -2,7 +2,7 @@
* #START_LICENSE#
* smp-webapp
* %%
- * Copyright (C) 2017 - 2023 European Commission | eDelivery | DomiSMP
+ * Copyright (C) 2017 - 2024 European Commission | eDelivery | DomiSMP
* %%
* Licensed under the EUPL, Version 1.2 or – as soon they will be approved by the European Commission - subsequent
* versions of the EUPL (the "Licence");
diff --git a/smp-webapp/src/test/java/eu/europa/ec/edelivery/smp/config/SMPWebApplicationInitializerTest.java b/smp-webapp/src/test/java/eu/europa/ec/edelivery/smp/config/SMPWebApplicationInitializerTest.java
index 4ba599ada45a361dfa9a3e488975337f2bccc3b2..08e55413a5d491ce60e821baee0eb5d8ec0c8edd 100644
--- a/smp-webapp/src/test/java/eu/europa/ec/edelivery/smp/config/SMPWebApplicationInitializerTest.java
+++ b/smp-webapp/src/test/java/eu/europa/ec/edelivery/smp/config/SMPWebApplicationInitializerTest.java
@@ -2,7 +2,7 @@
* #START_LICENSE#
* smp-webapp
* %%
- * Copyright (C) 2017 - 2023 European Commission | eDelivery | DomiSMP
+ * Copyright (C) 2017 - 2024 European Commission | eDelivery | DomiSMP
* %%
* Licensed under the EUPL, Version 1.2 or – as soon they will be approved by the European Commission - subsequent
* versions of the EUPL (the "Licence");
diff --git a/smp-webapp/src/test/java/eu/europa/ec/edelivery/smp/controllers/ResourceControllerSingleDomainTest.java b/smp-webapp/src/test/java/eu/europa/ec/edelivery/smp/controllers/ResourceControllerSingleDomainTest.java
index 1ce6d41cb6e3d53e3ebdef2980a56e8adcbf6c26..3ae62aa3cdae4405e1f50d908e8b12e3fe315259 100644
--- a/smp-webapp/src/test/java/eu/europa/ec/edelivery/smp/controllers/ResourceControllerSingleDomainTest.java
+++ b/smp-webapp/src/test/java/eu/europa/ec/edelivery/smp/controllers/ResourceControllerSingleDomainTest.java
@@ -2,7 +2,7 @@
* #START_LICENSE#
* smp-webapp
* %%
- * Copyright (C) 2017 - 2023 European Commission | eDelivery | DomiSMP
+ * Copyright (C) 2017 - 2024 European Commission | eDelivery | DomiSMP
* %%
* Licensed under the EUPL, Version 1.2 or – as soon they will be approved by the European Commission - subsequent
* versions of the EUPL (the "Licence");
diff --git a/smp-webapp/src/test/java/eu/europa/ec/edelivery/smp/controllers/ResourceControllerSubResourceTest.java b/smp-webapp/src/test/java/eu/europa/ec/edelivery/smp/controllers/ResourceControllerSubResourceTest.java
index f43363caccbfbcd97369c888008c502e293c5647..5c881147a7863b585914d785a88be9db2cd2b141 100644
--- a/smp-webapp/src/test/java/eu/europa/ec/edelivery/smp/controllers/ResourceControllerSubResourceTest.java
+++ b/smp-webapp/src/test/java/eu/europa/ec/edelivery/smp/controllers/ResourceControllerSubResourceTest.java
@@ -2,7 +2,7 @@
* #START_LICENSE#
* smp-webapp
* %%
- * Copyright (C) 2017 - 2023 European Commission | eDelivery | DomiSMP
+ * Copyright (C) 2017 - 2024 European Commission | eDelivery | DomiSMP
* %%
* Licensed under the EUPL, Version 1.2 or – as soon they will be approved by the European Commission - subsequent
* versions of the EUPL (the "Licence");
diff --git a/smp-webapp/src/test/java/eu/europa/ec/edelivery/smp/controllers/ResourceControllerTest.java b/smp-webapp/src/test/java/eu/europa/ec/edelivery/smp/controllers/ResourceControllerTest.java
index c1be5049846b3605fb35d31973a308a6aad39c46..d931fbfe0317539f7d52ef7cf7f95a30175bb0ed 100644
--- a/smp-webapp/src/test/java/eu/europa/ec/edelivery/smp/controllers/ResourceControllerTest.java
+++ b/smp-webapp/src/test/java/eu/europa/ec/edelivery/smp/controllers/ResourceControllerTest.java
@@ -2,7 +2,7 @@
* #START_LICENSE#
* smp-webapp
* %%
- * Copyright (C) 2017 - 2023 European Commission | eDelivery | DomiSMP
+ * Copyright (C) 2017 - 2024 European Commission | eDelivery | DomiSMP
* %%
* Licensed under the EUPL, Version 1.2 or – as soon they will be approved by the European Commission - subsequent
* versions of the EUPL (the "Licence");
diff --git a/smp-webapp/src/test/java/eu/europa/ec/edelivery/smp/controllers/RootControllerTest.java b/smp-webapp/src/test/java/eu/europa/ec/edelivery/smp/controllers/RootControllerTest.java
index cc1f8c153bc25a6644123f5e70253703a5668dfd..3a3fdf789af68cacbf46133033caeb2cbab54c5b 100644
--- a/smp-webapp/src/test/java/eu/europa/ec/edelivery/smp/controllers/RootControllerTest.java
+++ b/smp-webapp/src/test/java/eu/europa/ec/edelivery/smp/controllers/RootControllerTest.java
@@ -2,7 +2,7 @@
* #START_LICENSE#
* smp-webapp
* %%
- * Copyright (C) 2017 - 2023 European Commission | eDelivery | DomiSMP
+ * Copyright (C) 2017 - 2024 European Commission | eDelivery | DomiSMP
* %%
* Licensed under the EUPL, Version 1.2 or – as soon they will be approved by the European Commission - subsequent
* versions of the EUPL (the "Licence");
diff --git a/smp-webapp/src/test/java/eu/europa/ec/edelivery/smp/error/ErrorResponseBuilderTest.java b/smp-webapp/src/test/java/eu/europa/ec/edelivery/smp/error/ErrorResponseBuilderTest.java
index 5cc175af7f0fb7b29c8f32333fff57651bbbbbb5..1dcb674cbc64e0bfad2b3316c3fecae83d225133 100644
--- a/smp-webapp/src/test/java/eu/europa/ec/edelivery/smp/error/ErrorResponseBuilderTest.java
+++ b/smp-webapp/src/test/java/eu/europa/ec/edelivery/smp/error/ErrorResponseBuilderTest.java
@@ -2,7 +2,7 @@
* #START_LICENSE#
* smp-webapp
* %%
- * Copyright (C) 2017 - 2023 European Commission | eDelivery | DomiSMP
+ * Copyright (C) 2017 - 2024 European Commission | eDelivery | DomiSMP
* %%
* Licensed under the EUPL, Version 1.2 or – as soon they will be approved by the European Commission - subsequent
* versions of the EUPL (the "Licence");
diff --git a/smp-webapp/src/test/java/eu/europa/ec/edelivery/smp/error/SMPSecurityExceptionHandlerTest.java b/smp-webapp/src/test/java/eu/europa/ec/edelivery/smp/error/SMPSecurityExceptionHandlerTest.java
index e8aed031301602a9a13247b25693d64ae43c7699..98a1eef18cbf0dec46988ddb229b8672a1e0d407 100644
--- a/smp-webapp/src/test/java/eu/europa/ec/edelivery/smp/error/SMPSecurityExceptionHandlerTest.java
+++ b/smp-webapp/src/test/java/eu/europa/ec/edelivery/smp/error/SMPSecurityExceptionHandlerTest.java
@@ -2,7 +2,7 @@
* #START_LICENSE#
* smp-webapp
* %%
- * Copyright (C) 2017 - 2023 European Commission | eDelivery | DomiSMP
+ * Copyright (C) 2017 - 2024 European Commission | eDelivery | DomiSMP
* %%
* Licensed under the EUPL, Version 1.2 or – as soon they will be approved by the European Commission - subsequent
* versions of the EUPL (the "Licence");
diff --git a/smp-webapp/src/test/java/eu/europa/ec/edelivery/smp/error/ServiceErrorControllerAdviceTest.java b/smp-webapp/src/test/java/eu/europa/ec/edelivery/smp/error/ServiceErrorControllerAdviceTest.java
index 8376f2bea6c9c10f791c0541803b1f6dffdff74d..4a849d1e1c5092e908005ec51383bff0e3e4a02c 100644
--- a/smp-webapp/src/test/java/eu/europa/ec/edelivery/smp/error/ServiceErrorControllerAdviceTest.java
+++ b/smp-webapp/src/test/java/eu/europa/ec/edelivery/smp/error/ServiceErrorControllerAdviceTest.java
@@ -2,7 +2,7 @@
* #START_LICENSE#
* smp-webapp
* %%
- * Copyright (C) 2017 - 2023 European Commission | eDelivery | DomiSMP
+ * Copyright (C) 2017 - 2024 European Commission | eDelivery | DomiSMP
* %%
* Licensed under the EUPL, Version 1.2 or – as soon they will be approved by the European Commission - subsequent
* versions of the EUPL (the "Licence");
diff --git a/smp-webapp/src/test/java/eu/europa/ec/edelivery/smp/filter/FilterHandlerTest.java b/smp-webapp/src/test/java/eu/europa/ec/edelivery/smp/filter/FilterHandlerTest.java
index 21fc414f271d68b27f6400a42c926cad4e5383f8..257b66270c8486f24039de85bde77241e01a5c7c 100644
--- a/smp-webapp/src/test/java/eu/europa/ec/edelivery/smp/filter/FilterHandlerTest.java
+++ b/smp-webapp/src/test/java/eu/europa/ec/edelivery/smp/filter/FilterHandlerTest.java
@@ -2,7 +2,7 @@
* #START_LICENSE#
* smp-webapp
* %%
- * Copyright (C) 2017 - 2023 European Commission | eDelivery | DomiSMP
+ * Copyright (C) 2017 - 2024 European Commission | eDelivery | DomiSMP
* %%
* Licensed under the EUPL, Version 1.2 or – as soon they will be approved by the European Commission - subsequent
* versions of the EUPL (the "Licence");
@@ -68,4 +68,4 @@ public class FilterHandlerTest {
"Should have parsed the [" + encodedFilterValue + "] correctly to [" + expectedParsedFilterValue
+ "], decoding the original filter value and escaping any special SQL query characters that are to be used in a LIKE statement" );
}
-}
\ No newline at end of file
+}
diff --git a/smp-webapp/src/test/java/eu/europa/ec/edelivery/smp/monitor/MonitorControllerIT.java b/smp-webapp/src/test/java/eu/europa/ec/edelivery/smp/monitor/MonitorControllerIT.java
index 03620a1038c26ef71926ff421c1ea685c3b4f2bc..bcd3b2f20ad794221626ead19e7ab83d7bacac55 100644
--- a/smp-webapp/src/test/java/eu/europa/ec/edelivery/smp/monitor/MonitorControllerIT.java
+++ b/smp-webapp/src/test/java/eu/europa/ec/edelivery/smp/monitor/MonitorControllerIT.java
@@ -2,7 +2,7 @@
* #START_LICENSE#
* smp-webapp
* %%
- * Copyright (C) 2017 - 2023 European Commission | eDelivery | DomiSMP
+ * Copyright (C) 2017 - 2024 European Commission | eDelivery | DomiSMP
* %%
* Licensed under the EUPL, Version 1.2 or – as soon they will be approved by the European Commission - subsequent
* versions of the EUPL (the "Licence");
diff --git a/smp-webapp/src/test/java/eu/europa/ec/edelivery/smp/monitor/MonitorControllerTest.java b/smp-webapp/src/test/java/eu/europa/ec/edelivery/smp/monitor/MonitorControllerTest.java
index 8130568f5ffd2b6459702de65cfd13677f1e2297..ade77de26146830bd6cd9bf546039a5543085f24 100644
--- a/smp-webapp/src/test/java/eu/europa/ec/edelivery/smp/monitor/MonitorControllerTest.java
+++ b/smp-webapp/src/test/java/eu/europa/ec/edelivery/smp/monitor/MonitorControllerTest.java
@@ -2,7 +2,7 @@
* #START_LICENSE#
* smp-webapp
* %%
- * Copyright (C) 2017 - 2023 European Commission | eDelivery | DomiSMP
+ * Copyright (C) 2017 - 2024 European Commission | eDelivery | DomiSMP
* %%
* Licensed under the EUPL, Version 1.2 or – as soon they will be approved by the European Commission - subsequent
* versions of the EUPL (the "Licence");
diff --git a/smp-webapp/src/test/java/eu/europa/ec/edelivery/smp/server/security/SecurityConfigurationTest.java b/smp-webapp/src/test/java/eu/europa/ec/edelivery/smp/server/security/SecurityConfigurationTest.java
index 4a2b86dfda199232b76dd44adf9fba6614179cfe..345329344f076b09ee307137c8b3255daf8dc096 100644
--- a/smp-webapp/src/test/java/eu/europa/ec/edelivery/smp/server/security/SecurityConfigurationTest.java
+++ b/smp-webapp/src/test/java/eu/europa/ec/edelivery/smp/server/security/SecurityConfigurationTest.java
@@ -2,7 +2,7 @@
* #START_LICENSE#
* smp-webapp
* %%
- * Copyright (C) 2017 - 2023 European Commission | eDelivery | DomiSMP
+ * Copyright (C) 2017 - 2024 European Commission | eDelivery | DomiSMP
* %%
* Licensed under the EUPL, Version 1.2 or – as soon they will be approved by the European Commission - subsequent
* versions of the EUPL (the "Licence");
diff --git a/smp-webapp/src/test/java/eu/europa/ec/edelivery/smp/server/security/SignatureUtil.java b/smp-webapp/src/test/java/eu/europa/ec/edelivery/smp/server/security/SignatureUtil.java
index 3a3bd375dac9f7e6870f348fe34c196d8a5b9c1a..fe8f15be52e9cb4df88a4b2fcf12bc0c1228eda1 100644
--- a/smp-webapp/src/test/java/eu/europa/ec/edelivery/smp/server/security/SignatureUtil.java
+++ b/smp-webapp/src/test/java/eu/europa/ec/edelivery/smp/server/security/SignatureUtil.java
@@ -2,7 +2,7 @@
* #START_LICENSE#
* smp-webapp
* %%
- * Copyright (C) 2017 - 2023 European Commission | eDelivery | DomiSMP
+ * Copyright (C) 2017 - 2024 European Commission | eDelivery | DomiSMP
* %%
* Licensed under the EUPL, Version 1.2 or – as soon they will be approved by the European Commission - subsequent
* versions of the EUPL (the "Licence");
diff --git a/smp-webapp/src/test/java/eu/europa/ec/edelivery/smp/server/security/SignatureValidatorTest.java b/smp-webapp/src/test/java/eu/europa/ec/edelivery/smp/server/security/SignatureValidatorTest.java
index d9220d5ef45ab84c830f5e414cd81a4832d98f63..decc92ee465fbf6cf64338d5908268ac2bd2820e 100644
--- a/smp-webapp/src/test/java/eu/europa/ec/edelivery/smp/server/security/SignatureValidatorTest.java
+++ b/smp-webapp/src/test/java/eu/europa/ec/edelivery/smp/server/security/SignatureValidatorTest.java
@@ -2,7 +2,7 @@
* #START_LICENSE#
* smp-webapp
* %%
- * Copyright (C) 2017 - 2023 European Commission | eDelivery | DomiSMP
+ * Copyright (C) 2017 - 2024 European Commission | eDelivery | DomiSMP
* %%
* Licensed under the EUPL, Version 1.2 or – as soon they will be approved by the European Commission - subsequent
* versions of the EUPL (the "Licence");
diff --git a/smp-webapp/src/test/java/eu/europa/ec/edelivery/smp/server/security/UsernameReturningTestController.java b/smp-webapp/src/test/java/eu/europa/ec/edelivery/smp/server/security/UsernameReturningTestController.java
index bc74557e87638c38a11b2e485aca4ca90d126981..5626dc1b8e5081b3e0903c65af9d9a44f5d3cce0 100644
--- a/smp-webapp/src/test/java/eu/europa/ec/edelivery/smp/server/security/UsernameReturningTestController.java
+++ b/smp-webapp/src/test/java/eu/europa/ec/edelivery/smp/server/security/UsernameReturningTestController.java
@@ -2,7 +2,7 @@
* #START_LICENSE#
* smp-webapp
* %%
- * Copyright (C) 2017 - 2023 European Commission | eDelivery | DomiSMP
+ * Copyright (C) 2017 - 2024 European Commission | eDelivery | DomiSMP
* %%
* Licensed under the EUPL, Version 1.2 or – as soon they will be approved by the European Commission - subsequent
* versions of the EUPL (the "Licence");
diff --git a/smp-webapp/src/test/java/eu/europa/ec/edelivery/smp/server/security/X509KeySelector.java b/smp-webapp/src/test/java/eu/europa/ec/edelivery/smp/server/security/X509KeySelector.java
index 1d911a20366fb10e36179449c9884cb9a3b1983a..aad3d089010d09909b44e11ac5d42b8551d4dfaa 100644
--- a/smp-webapp/src/test/java/eu/europa/ec/edelivery/smp/server/security/X509KeySelector.java
+++ b/smp-webapp/src/test/java/eu/europa/ec/edelivery/smp/server/security/X509KeySelector.java
@@ -2,7 +2,7 @@
* #START_LICENSE#
* smp-webapp
* %%
- * Copyright (C) 2017 - 2023 European Commission | eDelivery | DomiSMP
+ * Copyright (C) 2017 - 2024 European Commission | eDelivery | DomiSMP
* %%
* Licensed under the EUPL, Version 1.2 or – as soon they will be approved by the European Commission - subsequent
* versions of the EUPL (the "Licence");
diff --git a/smp-webapp/src/test/java/eu/europa/ec/edelivery/smp/test/PropertiesTestConfig.java b/smp-webapp/src/test/java/eu/europa/ec/edelivery/smp/test/PropertiesTestConfig.java
index fdec7d9ee300e8f3e288a31637f007d4091539d1..d34b07421ad6431e63aba9ed0753c37a8227799d 100644
--- a/smp-webapp/src/test/java/eu/europa/ec/edelivery/smp/test/PropertiesTestConfig.java
+++ b/smp-webapp/src/test/java/eu/europa/ec/edelivery/smp/test/PropertiesTestConfig.java
@@ -2,7 +2,7 @@
* #START_LICENSE#
* smp-webapp
* %%
- * Copyright (C) 2017 - 2023 European Commission | eDelivery | DomiSMP
+ * Copyright (C) 2017 - 2024 European Commission | eDelivery | DomiSMP
* %%
* Licensed under the EUPL, Version 1.2 or – as soon they will be approved by the European Commission - subsequent
* versions of the EUPL (the "Licence");
diff --git a/smp-webapp/src/test/java/eu/europa/ec/edelivery/smp/test/SmpTestWebAppConfig.java b/smp-webapp/src/test/java/eu/europa/ec/edelivery/smp/test/SmpTestWebAppConfig.java
index a0c827491e737f3fbdefd0d12d4983c4ab0a6e07..6c8094c88c2ac3f4902f9ec1233b70e9f87495d6 100644
--- a/smp-webapp/src/test/java/eu/europa/ec/edelivery/smp/test/SmpTestWebAppConfig.java
+++ b/smp-webapp/src/test/java/eu/europa/ec/edelivery/smp/test/SmpTestWebAppConfig.java
@@ -2,7 +2,7 @@
* #START_LICENSE#
* smp-webapp
* %%
- * Copyright (C) 2017 - 2023 European Commission | eDelivery | DomiSMP
+ * Copyright (C) 2017 - 2024 European Commission | eDelivery | DomiSMP
* %%
* Licensed under the EUPL, Version 1.2 or – as soon they will be approved by the European Commission - subsequent
* versions of the EUPL (the "Licence");
diff --git a/smp-webapp/src/test/java/eu/europa/ec/edelivery/smp/test/testutils/MockMvcUtils.java b/smp-webapp/src/test/java/eu/europa/ec/edelivery/smp/test/testutils/MockMvcUtils.java
index 4e0412ceecc533c9c1db2a7a04054a1c0bf10d81..948151f5e35c237238cba5d556442c0d96b820ef 100644
--- a/smp-webapp/src/test/java/eu/europa/ec/edelivery/smp/test/testutils/MockMvcUtils.java
+++ b/smp-webapp/src/test/java/eu/europa/ec/edelivery/smp/test/testutils/MockMvcUtils.java
@@ -2,7 +2,7 @@
* #START_LICENSE#
* smp-webapp
* %%
- * Copyright (C) 2017 - 2023 European Commission | eDelivery | DomiSMP
+ * Copyright (C) 2017 - 2024 European Commission | eDelivery | DomiSMP
* %%
* Licensed under the EUPL, Version 1.2 or – as soon they will be approved by the European Commission - subsequent
* versions of the EUPL (the "Licence");
diff --git a/smp-webapp/src/test/java/eu/europa/ec/edelivery/smp/test/testutils/TestROUtils.java b/smp-webapp/src/test/java/eu/europa/ec/edelivery/smp/test/testutils/TestROUtils.java
index 59c9f90a430ea13c234a2eb3e3dba0e9f191fb8d..2c2c67abb9733fd056a381bcc905ca1e6364bdb9 100644
--- a/smp-webapp/src/test/java/eu/europa/ec/edelivery/smp/test/testutils/TestROUtils.java
+++ b/smp-webapp/src/test/java/eu/europa/ec/edelivery/smp/test/testutils/TestROUtils.java
@@ -2,7 +2,7 @@
* #START_LICENSE#
* smp-webapp
* %%
- * Copyright (C) 2017 - 2023 European Commission | eDelivery | DomiSMP
+ * Copyright (C) 2017 - 2024 European Commission | eDelivery | DomiSMP
* %%
* Licensed under the EUPL, Version 1.2 or – as soon they will be approved by the European Commission - subsequent
* versions of the EUPL (the "Licence");
diff --git a/smp-webapp/src/test/java/eu/europa/ec/edelivery/smp/test/testutils/X509CertificateTestUtils.java b/smp-webapp/src/test/java/eu/europa/ec/edelivery/smp/test/testutils/X509CertificateTestUtils.java
index 1d53852edd17fb91c854727966d3c0e1ce666586..2be0e8842954e84f4f1cb02c5799a213252bf4f1 100644
--- a/smp-webapp/src/test/java/eu/europa/ec/edelivery/smp/test/testutils/X509CertificateTestUtils.java
+++ b/smp-webapp/src/test/java/eu/europa/ec/edelivery/smp/test/testutils/X509CertificateTestUtils.java
@@ -2,7 +2,7 @@
* #START_LICENSE#
* smp-webapp
* %%
- * Copyright (C) 2017 - 2023 European Commission | eDelivery | DomiSMP
+ * Copyright (C) 2017 - 2024 European Commission | eDelivery | DomiSMP
* %%
* Licensed under the EUPL, Version 1.2 or – as soon they will be approved by the European Commission - subsequent
* versions of the EUPL (the "Licence");
diff --git a/smp-webapp/src/test/java/eu/europa/ec/edelivery/smp/ui/AbstractControllerTest.java b/smp-webapp/src/test/java/eu/europa/ec/edelivery/smp/ui/AbstractControllerTest.java
index 6aea753d2f94cfe2e4cab7d071f9723b9a1e61fe..ca359b5f06070b8c05650d716dfc9fc280fe50ed 100644
--- a/smp-webapp/src/test/java/eu/europa/ec/edelivery/smp/ui/AbstractControllerTest.java
+++ b/smp-webapp/src/test/java/eu/europa/ec/edelivery/smp/ui/AbstractControllerTest.java
@@ -2,7 +2,7 @@
* #START_LICENSE#
* smp-webapp
* %%
- * Copyright (C) 2017 - 2023 European Commission | eDelivery | DomiSMP
+ * Copyright (C) 2017 - 2024 European Commission | eDelivery | DomiSMP
* %%
* Licensed under the EUPL, Version 1.2 or – as soon they will be approved by the European Commission - subsequent
* versions of the EUPL (the "Licence");
diff --git a/smp-webapp/src/test/java/eu/europa/ec/edelivery/smp/ui/AuthenticationResourceIT.java b/smp-webapp/src/test/java/eu/europa/ec/edelivery/smp/ui/AuthenticationResourceIT.java
index bc84916dc98d76b08fb1e18ff139a2cdc6239580..e4304598315cc2d67f936b6404089977eb78cac7 100644
--- a/smp-webapp/src/test/java/eu/europa/ec/edelivery/smp/ui/AuthenticationResourceIT.java
+++ b/smp-webapp/src/test/java/eu/europa/ec/edelivery/smp/ui/AuthenticationResourceIT.java
@@ -2,7 +2,7 @@
* #START_LICENSE#
* smp-webapp
* %%
- * Copyright (C) 2017 - 2023 European Commission | eDelivery | DomiSMP
+ * Copyright (C) 2017 - 2024 European Commission | eDelivery | DomiSMP
* %%
* Licensed under the EUPL, Version 1.2 or – as soon they will be approved by the European Commission - subsequent
* versions of the EUPL (the "Licence");
diff --git a/smp-webapp/src/test/java/eu/europa/ec/edelivery/smp/ui/AuthenticationResourceTest.java b/smp-webapp/src/test/java/eu/europa/ec/edelivery/smp/ui/AuthenticationResourceTest.java
index 438326fbb19c7146a46c3eb93798abe2773051c7..849be1b1beb588ae364a4fe0e0c1270da607266c 100644
--- a/smp-webapp/src/test/java/eu/europa/ec/edelivery/smp/ui/AuthenticationResourceTest.java
+++ b/smp-webapp/src/test/java/eu/europa/ec/edelivery/smp/ui/AuthenticationResourceTest.java
@@ -2,7 +2,7 @@
* #START_LICENSE#
* smp-webapp
* %%
- * Copyright (C) 2017 - 2023 European Commission | eDelivery | DomiSMP
+ * Copyright (C) 2017 - 2024 European Commission | eDelivery | DomiSMP
* %%
* Licensed under the EUPL, Version 1.2 or – as soon they will be approved by the European Commission - subsequent
* versions of the EUPL (the "Licence");
diff --git a/smp-webapp/src/test/java/eu/europa/ec/edelivery/smp/ui/edit/DocumentEditControllerIT.java b/smp-webapp/src/test/java/eu/europa/ec/edelivery/smp/ui/edit/DocumentEditControllerIT.java
index 6dd9b2cf45d118e126888d39ec5d83945232b6f6..13e9509ddbee2bd0da8809096de69973c46b27dc 100644
--- a/smp-webapp/src/test/java/eu/europa/ec/edelivery/smp/ui/edit/DocumentEditControllerIT.java
+++ b/smp-webapp/src/test/java/eu/europa/ec/edelivery/smp/ui/edit/DocumentEditControllerIT.java
@@ -2,7 +2,7 @@
* #START_LICENSE#
* smp-webapp
* %%
- * Copyright (C) 2017 - 2023 European Commission | eDelivery | DomiSMP
+ * Copyright (C) 2017 - 2024 European Commission | eDelivery | DomiSMP
* %%
* Licensed under the EUPL, Version 1.2 or – as soon they will be approved by the European Commission - subsequent
* versions of the EUPL (the "Licence");
diff --git a/smp-webapp/src/test/java/eu/europa/ec/edelivery/smp/ui/edit/DomainEditControllerIT.java b/smp-webapp/src/test/java/eu/europa/ec/edelivery/smp/ui/edit/DomainEditControllerIT.java
index ebb49801a21df07576cd9a7bdf893567f44d5367..4b40ed61b6a0ddff63b572f32225ed7099df5c69 100644
--- a/smp-webapp/src/test/java/eu/europa/ec/edelivery/smp/ui/edit/DomainEditControllerIT.java
+++ b/smp-webapp/src/test/java/eu/europa/ec/edelivery/smp/ui/edit/DomainEditControllerIT.java
@@ -2,7 +2,7 @@
* #START_LICENSE#
* smp-webapp
* %%
- * Copyright (C) 2017 - 2023 European Commission | eDelivery | DomiSMP
+ * Copyright (C) 2017 - 2024 European Commission | eDelivery | DomiSMP
* %%
* Licensed under the EUPL, Version 1.2 or – as soon they will be approved by the European Commission - subsequent
* versions of the EUPL (the "Licence");
diff --git a/smp-webapp/src/test/java/eu/europa/ec/edelivery/smp/ui/edit/DomainEditControllerTest.java b/smp-webapp/src/test/java/eu/europa/ec/edelivery/smp/ui/edit/DomainEditControllerTest.java
index b56a7b81fad7bdc40de60930e84da30b70ca3194..eb8d16b6fd916e33b673ec2e2baf4815acd147f9 100644
--- a/smp-webapp/src/test/java/eu/europa/ec/edelivery/smp/ui/edit/DomainEditControllerTest.java
+++ b/smp-webapp/src/test/java/eu/europa/ec/edelivery/smp/ui/edit/DomainEditControllerTest.java
@@ -2,7 +2,7 @@
* #START_LICENSE#
* smp-webapp
* %%
- * Copyright (C) 2017 - 2023 European Commission | eDelivery | DomiSMP
+ * Copyright (C) 2017 - 2024 European Commission | eDelivery | DomiSMP
* %%
* Licensed under the EUPL, Version 1.2 or – as soon they will be approved by the European Commission - subsequent
* versions of the EUPL (the "Licence");
diff --git a/smp-webapp/src/test/java/eu/europa/ec/edelivery/smp/ui/edit/GroupEditControllerIT.java b/smp-webapp/src/test/java/eu/europa/ec/edelivery/smp/ui/edit/GroupEditControllerIT.java
index f017d1d9c101fcad1c2517cbdec5fb68d5149930..1fe33961e7e52fec253b232376e0a76fd7880f94 100644
--- a/smp-webapp/src/test/java/eu/europa/ec/edelivery/smp/ui/edit/GroupEditControllerIT.java
+++ b/smp-webapp/src/test/java/eu/europa/ec/edelivery/smp/ui/edit/GroupEditControllerIT.java
@@ -2,7 +2,7 @@
* #START_LICENSE#
* smp-webapp
* %%
- * Copyright (C) 2017 - 2023 European Commission | eDelivery | DomiSMP
+ * Copyright (C) 2017 - 2024 European Commission | eDelivery | DomiSMP
* %%
* Licensed under the EUPL, Version 1.2 or – as soon they will be approved by the European Commission - subsequent
* versions of the EUPL (the "Licence");
diff --git a/smp-webapp/src/test/java/eu/europa/ec/edelivery/smp/ui/edit/ResourceEditControllerIT.java b/smp-webapp/src/test/java/eu/europa/ec/edelivery/smp/ui/edit/ResourceEditControllerIT.java
index 489fde0a34cfe7ea6bf991ce10f8faf684e362ce..74faab9403ace28d639a0a0ae4bcc3ab5fe1a495 100644
--- a/smp-webapp/src/test/java/eu/europa/ec/edelivery/smp/ui/edit/ResourceEditControllerIT.java
+++ b/smp-webapp/src/test/java/eu/europa/ec/edelivery/smp/ui/edit/ResourceEditControllerIT.java
@@ -2,7 +2,7 @@
* #START_LICENSE#
* smp-webapp
* %%
- * Copyright (C) 2017 - 2023 European Commission | eDelivery | DomiSMP
+ * Copyright (C) 2017 - 2024 European Commission | eDelivery | DomiSMP
* %%
* Licensed under the EUPL, Version 1.2 or – as soon they will be approved by the European Commission - subsequent
* versions of the EUPL (the "Licence");
diff --git a/smp-webapp/src/test/java/eu/europa/ec/edelivery/smp/ui/external/ApplicationResourceIT.java b/smp-webapp/src/test/java/eu/europa/ec/edelivery/smp/ui/external/ApplicationResourceIT.java
index 20c309a268be10e54790826aa6b6d4c9099c1024..eb9da43704674a2d6f553dad4aecdd083ea665cf 100644
--- a/smp-webapp/src/test/java/eu/europa/ec/edelivery/smp/ui/external/ApplicationResourceIT.java
+++ b/smp-webapp/src/test/java/eu/europa/ec/edelivery/smp/ui/external/ApplicationResourceIT.java
@@ -2,7 +2,7 @@
* #START_LICENSE#
* smp-webapp
* %%
- * Copyright (C) 2017 - 2023 European Commission | eDelivery | DomiSMP
+ * Copyright (C) 2017 - 2024 European Commission | eDelivery | DomiSMP
* %%
* Licensed under the EUPL, Version 1.2 or – as soon they will be approved by the European Commission - subsequent
* versions of the EUPL (the "Licence");
diff --git a/smp-webapp/src/test/java/eu/europa/ec/edelivery/smp/ui/external/DomainResourceIT.java b/smp-webapp/src/test/java/eu/europa/ec/edelivery/smp/ui/external/DomainResourceIT.java
index f99b019b7f8d133952e18495b7c2d681e3d1a7d1..c71840dd602d781962c536b8c8ca88183b97924e 100644
--- a/smp-webapp/src/test/java/eu/europa/ec/edelivery/smp/ui/external/DomainResourceIT.java
+++ b/smp-webapp/src/test/java/eu/europa/ec/edelivery/smp/ui/external/DomainResourceIT.java
@@ -2,7 +2,7 @@
* #START_LICENSE#
* smp-webapp
* %%
- * Copyright (C) 2017 - 2023 European Commission | eDelivery | DomiSMP
+ * Copyright (C) 2017 - 2024 European Commission | eDelivery | DomiSMP
* %%
* Licensed under the EUPL, Version 1.2 or – as soon they will be approved by the European Commission - subsequent
* versions of the EUPL (the "Licence");
diff --git a/smp-webapp/src/test/java/eu/europa/ec/edelivery/smp/ui/external/SearchResourceIT.java b/smp-webapp/src/test/java/eu/europa/ec/edelivery/smp/ui/external/SearchResourceIT.java
index ff219471c0201416028296c63248558c817f77a9..60aabb656927bff24ab0c9b552b7e8f4cfeb08b9 100644
--- a/smp-webapp/src/test/java/eu/europa/ec/edelivery/smp/ui/external/SearchResourceIT.java
+++ b/smp-webapp/src/test/java/eu/europa/ec/edelivery/smp/ui/external/SearchResourceIT.java
@@ -2,7 +2,7 @@
* #START_LICENSE#
* smp-webapp
* %%
- * Copyright (C) 2017 - 2023 European Commission | eDelivery | DomiSMP
+ * Copyright (C) 2017 - 2024 European Commission | eDelivery | DomiSMP
* %%
* Licensed under the EUPL, Version 1.2 or – as soon they will be approved by the European Commission - subsequent
* versions of the EUPL (the "Licence");
diff --git a/smp-webapp/src/test/java/eu/europa/ec/edelivery/smp/ui/external/UserControllerIT.java b/smp-webapp/src/test/java/eu/europa/ec/edelivery/smp/ui/external/UserControllerIT.java
index a5d3b3d81129837f2d887b7b30694fd46961a5a3..5d6f16160f681336b7616805455945dcd625bfa6 100644
--- a/smp-webapp/src/test/java/eu/europa/ec/edelivery/smp/ui/external/UserControllerIT.java
+++ b/smp-webapp/src/test/java/eu/europa/ec/edelivery/smp/ui/external/UserControllerIT.java
@@ -2,7 +2,7 @@
* #START_LICENSE#
* smp-webapp
* %%
- * Copyright (C) 2017 - 2023 European Commission | eDelivery | DomiSMP
+ * Copyright (C) 2017 - 2024 European Commission | eDelivery | DomiSMP
* %%
* Licensed under the EUPL, Version 1.2 or – as soon they will be approved by the European Commission - subsequent
* versions of the EUPL (the "Licence");
diff --git a/smp-webapp/src/test/java/eu/europa/ec/edelivery/smp/ui/external/UserResourceIT.java b/smp-webapp/src/test/java/eu/europa/ec/edelivery/smp/ui/external/UserResourceIT.java
index 967dde44df7d554f3bd339d43846d30a45d7fb3d..8b7efb20e669405336d24e2bd0a5680072cbb228 100644
--- a/smp-webapp/src/test/java/eu/europa/ec/edelivery/smp/ui/external/UserResourceIT.java
+++ b/smp-webapp/src/test/java/eu/europa/ec/edelivery/smp/ui/external/UserResourceIT.java
@@ -2,7 +2,7 @@
* #START_LICENSE#
* smp-webapp
* %%
- * Copyright (C) 2017 - 2023 European Commission | eDelivery | DomiSMP
+ * Copyright (C) 2017 - 2024 European Commission | eDelivery | DomiSMP
* %%
* Licensed under the EUPL, Version 1.2 or – as soon they will be approved by the European Commission - subsequent
* versions of the EUPL (the "Licence");
diff --git a/smp-webapp/src/test/java/eu/europa/ec/edelivery/smp/ui/internal/DomainAdminControllerIT.java b/smp-webapp/src/test/java/eu/europa/ec/edelivery/smp/ui/internal/DomainAdminControllerIT.java
index a298efe04d2b1344fb02b09cb6a81e9109d7c4f5..f407a6496f0e6d089a6b1fa78d68bb2717743bda 100644
--- a/smp-webapp/src/test/java/eu/europa/ec/edelivery/smp/ui/internal/DomainAdminControllerIT.java
+++ b/smp-webapp/src/test/java/eu/europa/ec/edelivery/smp/ui/internal/DomainAdminControllerIT.java
@@ -2,7 +2,7 @@
* #START_LICENSE#
* smp-webapp
* %%
- * Copyright (C) 2017 - 2023 European Commission | eDelivery | DomiSMP
+ * Copyright (C) 2017 - 2024 European Commission | eDelivery | DomiSMP
* %%
* Licensed under the EUPL, Version 1.2 or – as soon they will be approved by the European Commission - subsequent
* versions of the EUPL (the "Licence");
diff --git a/smp-webapp/src/test/java/eu/europa/ec/edelivery/smp/ui/internal/KeystoreAdminControllerIT.java b/smp-webapp/src/test/java/eu/europa/ec/edelivery/smp/ui/internal/KeystoreAdminControllerIT.java
index 9958cd26f210a229d3d8cbdf7d9177bd0b5dda43..0aa42b2b0eeb704d9fd39ac4b790948b68b26802 100644
--- a/smp-webapp/src/test/java/eu/europa/ec/edelivery/smp/ui/internal/KeystoreAdminControllerIT.java
+++ b/smp-webapp/src/test/java/eu/europa/ec/edelivery/smp/ui/internal/KeystoreAdminControllerIT.java
@@ -2,7 +2,7 @@
* #START_LICENSE#
* smp-webapp
* %%
- * Copyright (C) 2017 - 2023 European Commission | eDelivery | DomiSMP
+ * Copyright (C) 2017 - 2024 European Commission | eDelivery | DomiSMP
* %%
* Licensed under the EUPL, Version 1.2 or – as soon they will be approved by the European Commission - subsequent
* versions of the EUPL (the "Licence");
diff --git a/smp-webapp/src/test/java/eu/europa/ec/edelivery/smp/ui/internal/TruststoreAdminControllerIT.java b/smp-webapp/src/test/java/eu/europa/ec/edelivery/smp/ui/internal/TruststoreAdminControllerIT.java
index f8a80d85d5363cbd5fe70351d7e4af8c4782cd85..d9d39e5ec24c81bdaf2ea396447be508bd71b2b2 100644
--- a/smp-webapp/src/test/java/eu/europa/ec/edelivery/smp/ui/internal/TruststoreAdminControllerIT.java
+++ b/smp-webapp/src/test/java/eu/europa/ec/edelivery/smp/ui/internal/TruststoreAdminControllerIT.java
@@ -2,7 +2,7 @@
* #START_LICENSE#
* smp-webapp
* %%
- * Copyright (C) 2017 - 2023 European Commission | eDelivery | DomiSMP
+ * Copyright (C) 2017 - 2024 European Commission | eDelivery | DomiSMP
* %%
* Licensed under the EUPL, Version 1.2 or – as soon they will be approved by the European Commission - subsequent
* versions of the EUPL (the "Licence");
diff --git a/smp-webapp/src/test/java/eu/europa/ec/edelivery/smp/ui/internal/TruststoreAdminControllerTest.java b/smp-webapp/src/test/java/eu/europa/ec/edelivery/smp/ui/internal/TruststoreAdminControllerTest.java
index ca7e8a6055440ae055bc752b15ebeee4b7db57dd..8f987f790eceb9c2e494e60fa36e74c5e9c32da8 100644
--- a/smp-webapp/src/test/java/eu/europa/ec/edelivery/smp/ui/internal/TruststoreAdminControllerTest.java
+++ b/smp-webapp/src/test/java/eu/europa/ec/edelivery/smp/ui/internal/TruststoreAdminControllerTest.java
@@ -2,7 +2,7 @@
* #START_LICENSE#
* smp-webapp
* %%
- * Copyright (C) 2017 - 2023 European Commission | eDelivery | DomiSMP
+ * Copyright (C) 2017 - 2024 European Commission | eDelivery | DomiSMP
* %%
* Licensed under the EUPL, Version 1.2 or – as soon they will be approved by the European Commission - subsequent
* versions of the EUPL (the "Licence");
diff --git a/smp-webapp/src/test/java/eu/europa/ec/edelivery/smp/ui/internal/UserAdminControllerIT.java b/smp-webapp/src/test/java/eu/europa/ec/edelivery/smp/ui/internal/UserAdminControllerIT.java
index b4f70cd64a4529ca6f81b55dd356a6606c681cc5..08fb7e567b5095666fee46a5b375b0a2181f0a7f 100644
--- a/smp-webapp/src/test/java/eu/europa/ec/edelivery/smp/ui/internal/UserAdminControllerIT.java
+++ b/smp-webapp/src/test/java/eu/europa/ec/edelivery/smp/ui/internal/UserAdminControllerIT.java
@@ -2,7 +2,7 @@
* #START_LICENSE#
* smp-webapp
* %%
- * Copyright (C) 2017 - 2023 European Commission | eDelivery | DomiSMP
+ * Copyright (C) 2017 - 2024 European Commission | eDelivery | DomiSMP
* %%
* Licensed under the EUPL, Version 1.2 or – as soon they will be approved by the European Commission - subsequent
* versions of the EUPL (the "Licence");
diff --git a/smp-webapp/src/test/resources/cas-login/login-authenticationSuccess-001.xml b/smp-webapp/src/test/resources/cas-login/login-authenticationSuccess-001.xml
index 120993bb94db4b09f635f4b64e81585e61f695ec..3e01341ce7aa75ef83d1a8fc7c9a920d9cbd2f20 100644
--- a/smp-webapp/src/test/resources/cas-login/login-authenticationSuccess-001.xml
+++ b/smp-webapp/src/test/resources/cas-login/login-authenticationSuccess-001.xml
@@ -1,4 +1,23 @@
<?xml version="1.0" encoding="utf-8"?>
+<!--
+ #START_LICENSE#
+ smp-webapp
+ %%
+ Copyright (C) 2017 - 2024 European Commission | eDelivery | DomiSMP
+ %%
+ Licensed under the EUPL, Version 1.2 or – as soon they will be approved by the European Commission - subsequent
+ versions of the EUPL (the "Licence");
+ You may not use this work except in compliance with the Licence.
+ You may obtain a copy of the Licence at:
+
+ [PROJECT_HOME]\license\eupl-1.2\license.txt or https://joinup.ec.europa.eu/collection/eupl/eupl-text-eupl-12
+
+ Unless required by applicable law or agreed to in writing, software distributed under the Licence is
+ distributed on an "AS IS" basis, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the Licence for the specific language governing permissions and limitations under the Licence.
+ #END_LICENSE#
+ -->
+
<!-- The following snippet is the eu-login example -->
<cas:serviceResponse xmlns:cas="https://ecas.ec.europa.eu/cas/schemas"
server="EU Login MOCKUP version 6.2.7.LOCAL - 05/04/2019 - 18:15"
diff --git a/smp-webapp/src/test/resources/cas-login/login-authenticationSuccess-002.xml b/smp-webapp/src/test/resources/cas-login/login-authenticationSuccess-002.xml
index 52427d6274c561b5862a864d5c2cee260d37e7b6..48642d46daea98d563715b0de0a7652f87128ec7 100644
--- a/smp-webapp/src/test/resources/cas-login/login-authenticationSuccess-002.xml
+++ b/smp-webapp/src/test/resources/cas-login/login-authenticationSuccess-002.xml
@@ -1,4 +1,23 @@
<?xml version="1.0" encoding="utf-8"?>
+<!--
+ #START_LICENSE#
+ smp-webapp
+ %%
+ Copyright (C) 2017 - 2024 European Commission | eDelivery | DomiSMP
+ %%
+ Licensed under the EUPL, Version 1.2 or – as soon they will be approved by the European Commission - subsequent
+ versions of the EUPL (the "Licence");
+ You may not use this work except in compliance with the Licence.
+ You may obtain a copy of the Licence at:
+
+ [PROJECT_HOME]\license\eupl-1.2\license.txt or https://joinup.ec.europa.eu/collection/eupl/eupl-text-eupl-12
+
+ Unless required by applicable law or agreed to in writing, software distributed under the Licence is
+ distributed on an "AS IS" basis, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the Licence for the specific language governing permissions and limitations under the Licence.
+ #END_LICENSE#
+ -->
+
<!-- The following snippet is custom example -->
<cas:serviceResponse xmlns:cas='http://www.yale.edu/tp/cas'>
<cas:authenticationSuccess>
diff --git a/smp-webapp/src/test/resources/cas-login/login-authenticationSuccess-003.xml b/smp-webapp/src/test/resources/cas-login/login-authenticationSuccess-003.xml
index 6a4e66a7e3a815439142175425a971241f91b00a..51f0beaf50710856dfc78ce448aef759296182c7 100644
--- a/smp-webapp/src/test/resources/cas-login/login-authenticationSuccess-003.xml
+++ b/smp-webapp/src/test/resources/cas-login/login-authenticationSuccess-003.xml
@@ -1,4 +1,23 @@
<?xml version="1.0" encoding="utf-8"?>
+<!--
+ #START_LICENSE#
+ smp-webapp
+ %%
+ Copyright (C) 2017 - 2024 European Commission | eDelivery | DomiSMP
+ %%
+ Licensed under the EUPL, Version 1.2 or – as soon they will be approved by the European Commission - subsequent
+ versions of the EUPL (the "Licence");
+ You may not use this work except in compliance with the Licence.
+ You may obtain a copy of the Licence at:
+
+ [PROJECT_HOME]\license\eupl-1.2\license.txt or https://joinup.ec.europa.eu/collection/eupl/eupl-text-eupl-12
+
+ Unless required by applicable law or agreed to in writing, software distributed under the Licence is
+ distributed on an "AS IS" basis, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the Licence for the specific language governing permissions and limitations under the Licence.
+ #END_LICENSE#
+ -->
+
<!-- The following snippet is the eu-login example -->
<cas:serviceResponse xmlns:cas="https://ecas.ec.europa.eu/cas/schemas"
server="EU Login MOCKUP version 6.2.7.LOCAL - 05/04/2019 - 18:15"
diff --git a/smp-webapp/src/test/resources/config.properties b/smp-webapp/src/test/resources/config.properties
index c325e2680aefd0954530c42a13b80772109ab9c4..cdce93cdb4ccd1527a1753d0b63b766b3ecce020 100644
--- a/smp-webapp/src/test/resources/config.properties
+++ b/smp-webapp/src/test/resources/config.properties
@@ -2,7 +2,7 @@
# #START_LICENSE#
# smp-webapp
# %%
-# Copyright (C) 2017 - 2023 European Commission | eDelivery | DomiSMP
+# Copyright (C) 2017 - 2024 European Commission | eDelivery | DomiSMP
# %%
# Licensed under the EUPL, Version 1.2 or – as soon they will be approved by the European Commission - subsequent
# versions of the EUPL (the "Licence");
diff --git a/smp-webapp/src/test/resources/expected_output/GET_SignedServiceMetadata_response.xml b/smp-webapp/src/test/resources/expected_output/GET_SignedServiceMetadata_response.xml
index fe8e97953adb8e47ee4930964370bf40eefc81c4..417b8bc84dd51d24ecb68a171faa757bce275a95 100644
--- a/smp-webapp/src/test/resources/expected_output/GET_SignedServiceMetadata_response.xml
+++ b/smp-webapp/src/test/resources/expected_output/GET_SignedServiceMetadata_response.xml
@@ -3,7 +3,7 @@
#START_LICENSE#
smp-webapp
%%
- Copyright (C) 2017 - 2023 European Commission | eDelivery | DomiSMP
+ Copyright (C) 2017 - 2024 European Commission | eDelivery | DomiSMP
%%
Licensed under the EUPL, Version 1.2 or – as soon they will be approved by the European Commission - subsequent
versions of the EUPL (the "Licence");
diff --git a/smp-webapp/src/test/resources/expected_output/GET_SignedServiceMetadata_response_linarized.xml b/smp-webapp/src/test/resources/expected_output/GET_SignedServiceMetadata_response_linarized.xml
index e90abfc7cd220404242bad5dde92b766eec69c6c..ec3ce2a152e9ecd018282e1a623caca4ae19f7f1 100644
--- a/smp-webapp/src/test/resources/expected_output/GET_SignedServiceMetadata_response_linarized.xml
+++ b/smp-webapp/src/test/resources/expected_output/GET_SignedServiceMetadata_response_linarized.xml
@@ -3,7 +3,7 @@
#START_LICENSE#
smp-webapp
%%
- Copyright (C) 2017 - 2023 European Commission | eDelivery | DomiSMP
+ Copyright (C) 2017 - 2024 European Commission | eDelivery | DomiSMP
%%
Licensed under the EUPL, Version 1.2 or – as soon they will be approved by the European Commission - subsequent
versions of the EUPL (the "Licence");
diff --git a/smp-webapp/src/test/resources/expected_output/PUT_ServiceMetadata_request.xml b/smp-webapp/src/test/resources/expected_output/PUT_ServiceMetadata_request.xml
index 834044a76ac64cd06bba4152f73f587fe646a2e1..f5db4f3b63638106ab7ed3158449987551a72bb2 100644
--- a/smp-webapp/src/test/resources/expected_output/PUT_ServiceMetadata_request.xml
+++ b/smp-webapp/src/test/resources/expected_output/PUT_ServiceMetadata_request.xml
@@ -3,7 +3,7 @@
#START_LICENSE#
smp-webapp
%%
- Copyright (C) 2017 - 2023 European Commission | eDelivery | DomiSMP
+ Copyright (C) 2017 - 2024 European Commission | eDelivery | DomiSMP
%%
Licensed under the EUPL, Version 1.2 or – as soon they will be approved by the European Commission - subsequent
versions of the EUPL (the "Licence");
diff --git a/smp-webapp/src/test/resources/expected_output/PUT_ServiceMetadata_request_linarized.xml b/smp-webapp/src/test/resources/expected_output/PUT_ServiceMetadata_request_linarized.xml
index f02a2e4071de8e578ed74d769316b5698927a77a..6336de66ba7886de4c02f7a7dd2cb42d3a23a4f2 100644
--- a/smp-webapp/src/test/resources/expected_output/PUT_ServiceMetadata_request_linarized.xml
+++ b/smp-webapp/src/test/resources/expected_output/PUT_ServiceMetadata_request_linarized.xml
@@ -3,7 +3,7 @@
#START_LICENSE#
smp-webapp
%%
- Copyright (C) 2017 - 2023 European Commission | eDelivery | DomiSMP
+ Copyright (C) 2017 - 2024 European Commission | eDelivery | DomiSMP
%%
Licensed under the EUPL, Version 1.2 or – as soon they will be approved by the European Commission - subsequent
versions of the EUPL (the "Licence");
diff --git a/smp-webapp/src/test/resources/expected_output/PUT_ServiceMetadata_request_not_valid.xml b/smp-webapp/src/test/resources/expected_output/PUT_ServiceMetadata_request_not_valid.xml
index f0af98702b1d097055de98d5df96efb2d7b3e2f6..3c1cedd288e40a51645158c3d1954c7bdb07bee9 100644
--- a/smp-webapp/src/test/resources/expected_output/PUT_ServiceMetadata_request_not_valid.xml
+++ b/smp-webapp/src/test/resources/expected_output/PUT_ServiceMetadata_request_not_valid.xml
@@ -3,7 +3,7 @@
#START_LICENSE#
smp-webapp
%%
- Copyright (C) 2017 - 2023 European Commission | eDelivery | DomiSMP
+ Copyright (C) 2017 - 2024 European Commission | eDelivery | DomiSMP
%%
Licensed under the EUPL, Version 1.2 or – as soon they will be approved by the European Commission - subsequent
versions of the EUPL (the "Licence");
diff --git a/smp-webapp/src/test/resources/expected_output/SignedServiceMetadata_invalid_customized_signature.xml b/smp-webapp/src/test/resources/expected_output/SignedServiceMetadata_invalid_customized_signature.xml
index 41079175d696b9b1461b8fc7f1d208eb38decd49..81df851a1ca419708b4b2d55b75df5bf3ce9d860 100644
--- a/smp-webapp/src/test/resources/expected_output/SignedServiceMetadata_invalid_customized_signature.xml
+++ b/smp-webapp/src/test/resources/expected_output/SignedServiceMetadata_invalid_customized_signature.xml
@@ -3,7 +3,7 @@
#START_LICENSE#
smp-webapp
%%
- Copyright (C) 2017 - 2023 European Commission | eDelivery | DomiSMP
+ Copyright (C) 2017 - 2024 European Commission | eDelivery | DomiSMP
%%
Licensed under the EUPL, Version 1.2 or – as soon they will be approved by the European Commission - subsequent
versions of the EUPL (the "Licence");
diff --git a/smp-webapp/src/test/resources/expected_output/SignedServiceMetadata_invalid_default_signature.xml b/smp-webapp/src/test/resources/expected_output/SignedServiceMetadata_invalid_default_signature.xml
index ecd47d028d3edc1bbd27542464e535385cd22047..b936d7f21d06132e13d56a0bf67200c46b5b0c8f 100644
--- a/smp-webapp/src/test/resources/expected_output/SignedServiceMetadata_invalid_default_signature.xml
+++ b/smp-webapp/src/test/resources/expected_output/SignedServiceMetadata_invalid_default_signature.xml
@@ -3,7 +3,7 @@
#START_LICENSE#
smp-webapp
%%
- Copyright (C) 2017 - 2023 European Commission | eDelivery | DomiSMP
+ Copyright (C) 2017 - 2024 European Commission | eDelivery | DomiSMP
%%
Licensed under the EUPL, Version 1.2 or – as soon they will be approved by the European Commission - subsequent
versions of the EUPL (the "Licence");
diff --git a/smp-webapp/src/test/resources/input/ServiceMetadata.xml b/smp-webapp/src/test/resources/input/ServiceMetadata.xml
index ae325cadd9ebff25bc2ddf34b55cf73e837dccfb..38624ee0a949e8f8c3a5c33ab3edb862f7f68ffe 100644
--- a/smp-webapp/src/test/resources/input/ServiceMetadata.xml
+++ b/smp-webapp/src/test/resources/input/ServiceMetadata.xml
@@ -3,7 +3,7 @@
#START_LICENSE#
smp-webapp
%%
- Copyright (C) 2017 - 2023 European Commission | eDelivery | DomiSMP
+ Copyright (C) 2017 - 2024 European Commission | eDelivery | DomiSMP
%%
Licensed under the EUPL, Version 1.2 or – as soon they will be approved by the European Commission - subsequent
versions of the EUPL (the "Licence");
diff --git a/smp-webapp/src/test/resources/input/ServiceMetadata_linarized.xml b/smp-webapp/src/test/resources/input/ServiceMetadata_linarized.xml
index 03e1d77ee4b0dd055bd2088cf7bb72b6601b3fbf..c693976d0b3ed879c5d398bfd34c9123baa11cf5 100644
--- a/smp-webapp/src/test/resources/input/ServiceMetadata_linarized.xml
+++ b/smp-webapp/src/test/resources/input/ServiceMetadata_linarized.xml
@@ -3,7 +3,7 @@
#START_LICENSE#
smp-webapp
%%
- Copyright (C) 2017 - 2023 European Commission | eDelivery | DomiSMP
+ Copyright (C) 2017 - 2024 European Commission | eDelivery | DomiSMP
%%
Licensed under the EUPL, Version 1.2 or – as soon they will be approved by the European Commission - subsequent
versions of the EUPL (the "Licence");
diff --git a/smp-webapp/src/test/resources/input/SignedServiceMetadata_withoutSignature.xml b/smp-webapp/src/test/resources/input/SignedServiceMetadata_withoutSignature.xml
index a5846f181ff65abfdfe35f26cbda6b4b781f17fc..37c54c76369ec70366af3ddaee5abcdb0abed235 100644
--- a/smp-webapp/src/test/resources/input/SignedServiceMetadata_withoutSignature.xml
+++ b/smp-webapp/src/test/resources/input/SignedServiceMetadata_withoutSignature.xml
@@ -3,7 +3,7 @@
#START_LICENSE#
smp-webapp
%%
- Copyright (C) 2017 - 2023 European Commission | eDelivery | DomiSMP
+ Copyright (C) 2017 - 2024 European Commission | eDelivery | DomiSMP
%%
Licensed under the EUPL, Version 1.2 or – as soon they will be approved by the European Commission - subsequent
versions of the EUPL (the "Licence");
diff --git a/smp-webapp/src/test/resources/input/extensionMarshal.xml b/smp-webapp/src/test/resources/input/extensionMarshal.xml
index 935efdd44a1f5334935bca4ef427516714c312ae..7ca9a030498030d123d5fb54f9e82063d9d7fbce 100644
--- a/smp-webapp/src/test/resources/input/extensionMarshal.xml
+++ b/smp-webapp/src/test/resources/input/extensionMarshal.xml
@@ -2,7 +2,7 @@
#START_LICENSE#
smp-webapp
%%
- Copyright (C) 2017 - 2023 European Commission | eDelivery | DomiSMP
+ Copyright (C) 2017 - 2024 European Commission | eDelivery | DomiSMP
%%
Licensed under the EUPL, Version 1.2 or – as soon they will be approved by the European Commission - subsequent
versions of the EUPL (the "Licence");
diff --git a/smp-webapp/src/test/resources/logback-test.xml b/smp-webapp/src/test/resources/logback-test.xml
index b02fcb6598ce1658b2b306ba5a43ce6a284fe187..51db87576a779849ad5ecb402b8766e7f199e198 100644
--- a/smp-webapp/src/test/resources/logback-test.xml
+++ b/smp-webapp/src/test/resources/logback-test.xml
@@ -3,7 +3,7 @@
#START_LICENSE#
smp-webapp
%%
- Copyright (C) 2017 - 2023 European Commission | eDelivery | DomiSMP
+ Copyright (C) 2017 - 2024 European Commission | eDelivery | DomiSMP
%%
Licensed under the EUPL, Version 1.2 or – as soon they will be approved by the European Commission - subsequent
versions of the EUPL (the "Licence");
diff --git a/smp-webapp/src/test/resources/persistence-test-h2.properties b/smp-webapp/src/test/resources/persistence-test-h2.properties
index fffd830a7f4ab259541c17c40c553cc15f25f211..ff5994c4bbf48fa9c31954f1be7cf5742e3205d5 100644
--- a/smp-webapp/src/test/resources/persistence-test-h2.properties
+++ b/smp-webapp/src/test/resources/persistence-test-h2.properties
@@ -2,7 +2,7 @@
# #START_LICENSE#
# smp-webapp
# %%
-# Copyright (C) 2017 - 2023 European Commission | eDelivery | DomiSMP
+# Copyright (C) 2017 - 2024 European Commission | eDelivery | DomiSMP
# %%
# Licensed under the EUPL, Version 1.2 or – as soon they will be approved by the European Commission - subsequent
# versions of the EUPL (the "Licence");
diff --git a/smp-webapp/src/test/resources/test-application.properties b/smp-webapp/src/test/resources/test-application.properties
index ee16aeb822d7cbb9edc50f1aa3c52f2350f22201..65403947e22d67e8b1eca1474f6b4cb2112b7983 100644
--- a/smp-webapp/src/test/resources/test-application.properties
+++ b/smp-webapp/src/test/resources/test-application.properties
@@ -2,7 +2,7 @@
# #START_LICENSE#
# smp-webapp
# %%
-# Copyright (C) 2017 - 2023 European Commission | eDelivery | DomiSMP
+# Copyright (C) 2017 - 2024 European Commission | eDelivery | DomiSMP
# %%
# Licensed under the EUPL, Version 1.2 or – as soon they will be approved by the European Commission - subsequent
# versions of the EUPL (the "Licence");