diff --git a/Notice.md b/Notice.md index f289cdcafe2e917524d77c37d8bd7107c1aaee2e..145e621ed19f9d98dc1107a2254699fb54e2940e 100644 --- a/Notice.md +++ b/Notice.md @@ -1,4 +1,4 @@ -Copyright 2016, 2024 European Union +Copyright 2017, 2024 European Union Licensed 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. @@ -24,35 +24,35 @@ This product includes dynamically linked software developed by third parties whi - Copyright: - Copyright (c) 2005 - 2024 QOS.ch (http://www.qos.ch), Ceki Gulcu, Joern Huxhorn -***com.fasterxml.jackson.core:jackson-core:2.17.0*** +***com.fasterxml.jackson.core:jackson-core:2.17.2*** - License: Apache-2.0 - Url: https://www.apache.org/licenses/LICENSE-2.0.txt - File: license/third-party-licenses/Apache-2.0.txt - Copyright: - Copyright (c) 2008 - 2024 FasterXML (http://fasterxml.com/), Tatu Saloranta -***com.fasterxml.jackson.core:jackson-databind:2.17.0*** +***com.fasterxml.jackson.core:jackson-databind:2.17.2*** - License: Apache-2.0 - Url: https://www.apache.org/licenses/LICENSE-2.0.txt - File: license/third-party-licenses/Apache-2.0.txt - Copyright: - Copyright (c) 2008 - 2024 FasterXML (http://fasterxml.com/), Tatu Saloranta -***com.fasterxml.jackson.datatype:jackson-datatype-jsr310:2.17.0*** +***com.fasterxml.jackson.datatype:jackson-datatype-jsr310:2.17.2*** - License: Apache-2.0 - Url: http://www.apache.org/licenses/LICENSE-2.0.txt - File: license/third-party-licenses/Apache-2.0.txt - Copyright: - Copyright (c) 2024 FasterXML (http://fasterxml.com/), Nick Williams -***com.fasterxml.jackson.module:jackson-module-jaxb-annotations:2.17.0*** +***com.fasterxml.jackson.module:jackson-module-jaxb-annotations:2.17.2*** - License: Apache-2.0 - Url: https://www.apache.org/licenses/LICENSE-2.0.txt - File: license/third-party-licenses/Apache-2.0.txt - Copyright: - Copyright (c) 2024 FasterXML (http://fasterxml.com/), Tatu Saloranta -***com.mysql:mysql-connector-j:8.3.0*** +***com.mysql:mysql-connector-j:8.4.0*** - License: GPL-2.0-or-later - Url: - File: license/third-party-licenses/GPL-2.0-or-later.txt @@ -73,7 +73,7 @@ This product includes dynamically linked software developed by third parties whi - Copyright: - Copyright (c) 2002 - 2024 The Apache Software Foundation (https://www.apache.org/), Martin Cooper, dIon Gillard, John McNally, Daniel Rall, Jason van Zyl, Robert Burrell Donkin, Sean C. Sullivan, Jochen Wiedmann, Simone Tripodi, Gary Gregory, Rob Tompkins -***commons-validator:commons-validator:1.8.0*** +***commons-validator:commons-validator:1.9.0*** - License: Apache-2.0 - Url: https://www.apache.org/licenses/LICENSE-2.0.txt - File: license/third-party-licenses/Apache-2.0.txt @@ -112,28 +112,28 @@ This product includes dynamically linked software developed by third parties whi - Copyright: - Copyright (c) 2024 GlassFish Community (https://javaee.github.io/glassfish), Linda De Michiel -***org.apache.commons:commons-lang3:3.14.0*** +***org.apache.commons:commons-lang3:3.17.0*** - License: Apache-2.0 - Url: https://www.apache.org/licenses/LICENSE-2.0.txt - File: license/third-party-licenses/Apache-2.0.txt - Copyright: - Copyright (c) 2001 - 2024 The Apache Software Foundation (https://www.apache.org/), Daniel Rall, Stephen Colebourne, Henri Yandell, Steven Caswell, Robert Burrell Donkin, Gary Gregory, Fredrik Westermarck, James Carman, Niall Pemberton, Matt Benson, Joerg Schaible, Oliver Heger, Paul Benedict, Benedikt Ritter, Duncan Jones, Loic Guibert, Rob Tompkins -***org.apache.cxf:cxf-rt-features-logging:3.5.8*** +***org.apache.cxf:cxf-rt-features-logging:3.5.9*** - License: Apache-2.0 - Url: https://www.apache.org/licenses/LICENSE-2.0.txt - File: license/third-party-licenses/Apache-2.0.txt - Copyright: - Copyright (c) 2006 - 2024 The Apache Software Foundation (https://www.apache.org/), The Apache CXF Team -***org.apache.cxf:cxf-rt-frontend-jaxws:3.5.8*** +***org.apache.cxf:cxf-rt-frontend-jaxws:3.5.9*** - License: Apache-2.0 - Url: https://www.apache.org/licenses/LICENSE-2.0.txt - File: license/third-party-licenses/Apache-2.0.txt - Copyright: - Copyright (c) 2006 - 2024 The Apache Software Foundation (https://www.apache.org/), The Apache CXF Team -***org.apache.cxf:cxf-rt-transports-http:3.5.8*** +***org.apache.cxf:cxf-rt-transports-http:3.5.9*** - License: Apache-2.0 - Url: https://www.apache.org/licenses/LICENSE-2.0.txt - File: license/third-party-licenses/Apache-2.0.txt @@ -147,13 +147,20 @@ This product includes dynamically linked software developed by third parties whi - Copyright: - Copyright (c) 1999 - 2024 The Apache Software Foundation (http://www.apache.org/), Ortwin Glueck, Oleg Kalnichevski, Asankha C. Perera, Sebastian Bazley, Erik Abele, Ant Elder, Paul Fremantle, Roland Weber, Sam Berlin, Sean C. Sullivan, Jonathan Moore, Gary Gregory, William Speirs, Karl Wright, Francois-Xavier Bonnet -***org.apache.tomcat.embed:tomcat-embed-jasper:9.0.88*** +***org.apache.tomcat.embed:tomcat-embed-jasper:9.0.95*** - License: Apache-2.0 - Url: http://www.apache.org/licenses/LICENSE-2.0.txt - File: license/third-party-licenses/Apache-2.0.txt - Copyright: - Copyright (c) 2024 +***org.ehcache:ehcache:3.10.8*** +- License: Apache-2.0 +- Url: http://www.apache.org/licenses/LICENSE-2.0.txt +- File: license/third-party-licenses/Apache-2.0.txt +- Copyright: + - Copyright (c) 2024 Terracotta Inc., a wholly-owned subsidiary of Software AG USA, Inc. (http://terracotta.org), Terracotta Engineers + ***org.glassfish.jaxb:jaxb-runtime:2.3.8*** - License: BSD-3-Clause - Url: http://www.eclipse.org/org/documents/edl-v10.php @@ -196,56 +203,56 @@ This product includes dynamically linked software developed by third parties whi - Copyright: - Copyright (c) 2005 - 2024 QOS.ch (http://www.qos.ch), Ceki Gulcu -***org.springframework:spring-beans:5.3.34*** +***org.springframework:spring-beans:5.3.39*** - License: Apache-2.0 - Url: https://www.apache.org/licenses/LICENSE-2.0 - File: license/third-party-licenses/Apache-2.0.txt - Copyright: - Copyright (c) 2024 Spring IO (https://spring.io/projects/spring-framework), Juergen Hoeller -***org.springframework:spring-context:5.3.34*** +***org.springframework:spring-context:5.3.39*** - License: Apache-2.0 - Url: https://www.apache.org/licenses/LICENSE-2.0 - File: license/third-party-licenses/Apache-2.0.txt - Copyright: - Copyright (c) 2024 Spring IO (https://spring.io/projects/spring-framework), Juergen Hoeller -***org.springframework:spring-context-support:5.3.34*** +***org.springframework:spring-context-support:5.3.39*** - License: Apache-2.0 - Url: https://www.apache.org/licenses/LICENSE-2.0 - File: license/third-party-licenses/Apache-2.0.txt - Copyright: - Copyright (c) 2024 Spring IO (https://spring.io/projects/spring-framework), Juergen Hoeller -***org.springframework:spring-core:5.3.34*** +***org.springframework:spring-core:5.3.39*** - License: Apache-2.0 - Url: https://www.apache.org/licenses/LICENSE-2.0 - File: license/third-party-licenses/Apache-2.0.txt - Copyright: - Copyright (c) 2024 Spring IO (https://spring.io/projects/spring-framework), Juergen Hoeller -***org.springframework:spring-jdbc:5.3.34*** +***org.springframework:spring-jdbc:5.3.39*** - License: Apache-2.0 - Url: https://www.apache.org/licenses/LICENSE-2.0 - File: license/third-party-licenses/Apache-2.0.txt - Copyright: - Copyright (c) 2024 Spring IO (https://spring.io/projects/spring-framework), Juergen Hoeller -***org.springframework:spring-orm:5.3.34*** +***org.springframework:spring-orm:5.3.39*** - License: Apache-2.0 - Url: https://www.apache.org/licenses/LICENSE-2.0 - File: license/third-party-licenses/Apache-2.0.txt - Copyright: - Copyright (c) 2024 Spring IO (https://spring.io/projects/spring-framework), Juergen Hoeller -***org.springframework:spring-web:5.3.34*** +***org.springframework:spring-web:5.3.39*** - License: Apache-2.0 - Url: https://www.apache.org/licenses/LICENSE-2.0 - File: license/third-party-licenses/Apache-2.0.txt - Copyright: - Copyright (c) 2024 Spring IO (https://spring.io/projects/spring-framework), Juergen Hoeller -***org.springframework:spring-webmvc:5.3.34*** +***org.springframework:spring-webmvc:5.3.39*** - License: Apache-2.0 - Url: https://www.apache.org/licenses/LICENSE-2.0 - File: license/third-party-licenses/Apache-2.0.txt @@ -259,28 +266,28 @@ This product includes dynamically linked software developed by third parties whi - Copyright: - Copyright (c) 2024 VMware, Inc. (https://spring.io), Spring -***org.springframework.security:spring-security-cas:5.8.12*** +***org.springframework.security:spring-security-cas:5.8.14*** - License: Apache-2.0 - Url: https://www.apache.org/licenses/LICENSE-2.0 - File: license/third-party-licenses/Apache-2.0.txt - Copyright: - Copyright (c) 2024 Pivotal Software, Inc. (https://spring.io), Pivotal -***org.springframework.security:spring-security-config:5.8.12*** +***org.springframework.security:spring-security-config:5.8.14*** - License: Apache-2.0 - Url: https://www.apache.org/licenses/LICENSE-2.0 - File: license/third-party-licenses/Apache-2.0.txt - Copyright: - Copyright (c) 2024 Pivotal Software, Inc. (https://spring.io), Pivotal -***org.springframework.security:spring-security-core:5.8.12*** +***org.springframework.security:spring-security-core:5.8.14*** - License: Apache-2.0 - Url: https://www.apache.org/licenses/LICENSE-2.0 - File: license/third-party-licenses/Apache-2.0.txt - Copyright: - Copyright (c) 2024 Pivotal Software, Inc. (https://spring.io), Pivotal -***org.springframework.security:spring-security-test:5.8.12*** +***org.springframework.security:spring-security-test:5.8.14*** - License: Apache-2.0 - Url: https://www.apache.org/licenses/LICENSE-2.0 - File: license/third-party-licenses/Apache-2.0.txt diff --git a/domismp-tests/domismp-docker/compose/domismp-tomcat-mysql/docker-compose.yml b/domismp-tests/domismp-docker/compose/domismp-tomcat-mysql/docker-compose.yml index 0a096bc937749421cb1d47f1cabca641b57ec524..77cca8c7494eaae65ddeae927fa279b202c36ca3 100644 --- a/domismp-tests/domismp-docker/compose/domismp-tomcat-mysql/docker-compose.yml +++ b/domismp-tests/domismp-docker/compose/domismp-tomcat-mysql/docker-compose.yml @@ -49,7 +49,7 @@ services: # - "7102:7102" mail-service: - image: inbucket/inbucket:3.0.0 + image: inbucket/inbucket:3.1.0 hostname: mail-server.smp.local # ports: # - "9005:9000" diff --git a/pom.xml b/pom.xml index 631276e1d7fbcfe7ca11fa09909680cd127171af..e404d648a2e6dcdc799732a661169f673dd76142 100644 --- a/pom.xml +++ b/pom.xml @@ -902,7 +902,11 @@ See the Licence for the specific language governing permissions and limitations <profile> <!-- Update license eupl-1.2 headers to all files which matches filter bellow. Note if processStartTag, processEndTag does not match the values in plugin configuration, the license will be added - twice. Manually check all changed files!--> + twice. Manually check all changed files! + + NOTE: do not forget to run the command before the release: + mvn clean process-resources -Pupdate-license-headers + --> <id>update-license-headers</id> <build> <plugins> @@ -962,7 +966,8 @@ See the Licence for the specific language governing permissions and limitations mvn clean process-resources -Plicense-generate-notice - NOTE: do not forget to commit changed NOTICE.md and third party licenses! + NOTE: do not forget to regenerate the NOTICE.md file when adding new dependencies or updating the existing ones + and before the release! --> <id>license-generate-notice</id> <build> diff --git a/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/config/init/SMPLocaleFileSystemInitializer.java b/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/config/init/SMPLocaleFileSystemInitializer.java index cbedd2b57c61fc2f804f750e2285bd7b8f18e30d..58e687af37331069f8b4fed385c6fe016bc30d5a 100644 --- a/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/config/init/SMPLocaleFileSystemInitializer.java +++ b/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/config/init/SMPLocaleFileSystemInitializer.java @@ -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# + */ package eu.europa.ec.edelivery.smp.config.init; import eu.europa.ec.edelivery.smp.logging.SMPLogger; diff --git a/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/conversion/DBDocumentVersionEventToDocumentVersionEventROConverter.java b/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/conversion/DBDocumentVersionEventToDocumentVersionEventROConverter.java index 5e2bf586f84d4fc7722068137535e542d11b112a..2014bb0dc729fc5f605d18c283599a0ffa0be239 100644 --- a/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/conversion/DBDocumentVersionEventToDocumentVersionEventROConverter.java +++ b/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/conversion/DBDocumentVersionEventToDocumentVersionEventROConverter.java @@ -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# + */ package eu.europa.ec.edelivery.smp.conversion; diff --git a/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/conversion/DBDomainConfToDomainPropROConverter.java b/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/conversion/DBDomainConfToDomainPropROConverter.java index 63c2d9b852d7b045595d4f53f2c1d7cada9034ef..3872625e239e5497c3c589d5cc242feea17800d4 100644 --- a/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/conversion/DBDomainConfToDomainPropROConverter.java +++ b/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/conversion/DBDomainConfToDomainPropROConverter.java @@ -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# + */ package eu.europa.ec.edelivery.smp.conversion; import eu.europa.ec.edelivery.smp.config.enums.SMPDomainPropertyEnum; diff --git a/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/conversion/DomainPropEnumToDomainPropROConverter.java b/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/conversion/DomainPropEnumToDomainPropROConverter.java index 66f5767d9b1d509fd71c3478c5141f6faff7f09b..c635f62b3af0215363affe1ca8e44a29ebebe3a6 100644 --- a/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/conversion/DomainPropEnumToDomainPropROConverter.java +++ b/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/conversion/DomainPropEnumToDomainPropROConverter.java @@ -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# + */ package eu.europa.ec.edelivery.smp.conversion; import eu.europa.ec.edelivery.smp.config.enums.SMPDomainPropertyEnum; diff --git a/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/data/enums/DocumentReferenceType.java b/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/data/enums/DocumentReferenceType.java index 957bb58889463fa3360a554b6caf61ad949c0ea9..8c137840b12c63d2005348880fdeda5c70fcbc5c 100644 --- a/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/data/enums/DocumentReferenceType.java +++ b/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/data/enums/DocumentReferenceType.java @@ -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# + */ package eu.europa.ec.edelivery.smp.data.enums; /** diff --git a/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/data/enums/DocumentVersionEventType.java b/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/data/enums/DocumentVersionEventType.java index 84031c27c9a06a5570fc1626e07174e3abd25500..103f3119e29befb80ac524dea4878ae15b7fe057 100644 --- a/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/data/enums/DocumentVersionEventType.java +++ b/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/data/enums/DocumentVersionEventType.java @@ -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# + */ package eu.europa.ec.edelivery.smp.data.enums; /** diff --git a/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/data/enums/DocumentVersionStatusType.java b/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/data/enums/DocumentVersionStatusType.java index ee055a3ae563754f54b1629e93f9dbacfa7ba035..649a8519d21f7a599d0613a2cf9fc92ff5b6c633 100644 --- a/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/data/enums/DocumentVersionStatusType.java +++ b/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/data/enums/DocumentVersionStatusType.java @@ -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# + */ package eu.europa.ec.edelivery.smp.data.enums; /** diff --git a/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/data/enums/EventSourceType.java b/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/data/enums/EventSourceType.java index d64e3b85bac7f04e7c981d28846e78859b587a62..ef5ea01089d3c1ee868aef2bb1438a2d37b40be9 100644 --- a/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/data/enums/EventSourceType.java +++ b/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/data/enums/EventSourceType.java @@ -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# + */ package eu.europa.ec.edelivery.smp.data.enums; /** diff --git a/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/data/model/doc/DBReviewDocumentVersionMapping.java b/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/data/model/doc/DBReviewDocumentVersionMapping.java index 85fa9fb96fb7d8e204ce5b2aaaa48609f4836012..e88a7029000b81b124b881a8e363d1292f9a14b6 100644 --- a/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/data/model/doc/DBReviewDocumentVersionMapping.java +++ b/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/data/model/doc/DBReviewDocumentVersionMapping.java @@ -1,9 +1,26 @@ +/*- + * #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# + */ package eu.europa.ec.edelivery.smp.data.model.doc; import eu.europa.ec.edelivery.smp.data.enums.DocumentVersionStatusType; import org.apache.commons.lang3.StringUtils; -import java.io.Serializable; import java.time.OffsetDateTime; /** diff --git a/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/data/model/doc/DBSearchReferenceDocumentMapping.java b/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/data/model/doc/DBSearchReferenceDocumentMapping.java index 28dda174bcd9fcda9fca04cca22cae1f67498e9f..af551e51329da97688e3516d54bfd27e2079a9ac 100644 --- a/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/data/model/doc/DBSearchReferenceDocumentMapping.java +++ b/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/data/model/doc/DBSearchReferenceDocumentMapping.java @@ -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# + */ package eu.europa.ec.edelivery.smp.data.model.doc; import eu.europa.ec.edelivery.smp.data.enums.DocumentReferenceType; diff --git a/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/data/ui/DocumentPropertyRO.java b/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/data/ui/DocumentPropertyRO.java index 648a3142beb41173286ce8834e319e853ea07ad3..a61632fa94b92ab61ff98943e82d57f1022f89ec 100644 --- a/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/data/ui/DocumentPropertyRO.java +++ b/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/data/ui/DocumentPropertyRO.java @@ -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# + */ package eu.europa.ec.edelivery.smp.data.ui; diff --git a/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/data/ui/DocumentVersionEventRO.java b/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/data/ui/DocumentVersionEventRO.java index 3c57005fbeb227a5235c0e50de5051846450bc14..1aab097f3bcfb87ed1f8e32e12d415665c2f3947 100644 --- a/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/data/ui/DocumentVersionEventRO.java +++ b/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/data/ui/DocumentVersionEventRO.java @@ -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# + */ package eu.europa.ec.edelivery.smp.data.ui; diff --git a/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/data/ui/DocumentVersionRO.java b/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/data/ui/DocumentVersionRO.java index a09a8bd302cca95b9f248bce941016a9ceb49c73..f313f479fbe42be7799aa1fea8a0ecf9de370a66 100644 --- a/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/data/ui/DocumentVersionRO.java +++ b/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/data/ui/DocumentVersionRO.java @@ -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# + */ package eu.europa.ec.edelivery.smp.data.ui; import eu.europa.ec.edelivery.smp.data.enums.DocumentVersionStatusType; diff --git a/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/data/ui/ReviewDocumentVersionRO.java b/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/data/ui/ReviewDocumentVersionRO.java index 9502fec65e2a1414f3c094c2cc13d97df2115ea5..d0930b2cc3775d06fb7fa56c0159b8ee09c67c50 100644 --- a/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/data/ui/ReviewDocumentVersionRO.java +++ b/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/data/ui/ReviewDocumentVersionRO.java @@ -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# + */ package eu.europa.ec.edelivery.smp.data.ui; import eu.europa.ec.edelivery.smp.data.enums.DocumentVersionStatusType; diff --git a/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/data/ui/SearchReferenceDocumentRO.java b/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/data/ui/SearchReferenceDocumentRO.java index b7c3960abbf05330aa8f7990beda4e5b62f5b8a1..af5bcb2f8f5688c8201b0a5b2b8e4029aa1f3ee4 100644 --- a/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/data/ui/SearchReferenceDocumentRO.java +++ b/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/data/ui/SearchReferenceDocumentRO.java @@ -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# + */ package eu.europa.ec.edelivery.smp.data.ui; import eu.europa.ec.edelivery.smp.data.enums.DocumentReferenceType; diff --git a/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/services/IdentifierFormatterService.java b/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/services/IdentifierFormatterService.java index 3167a05b0fe23474a1a6b27c3174420b778ee9cc..670392036b377e074a2f82d8bde1b3c39ab3ccbd 100644 --- a/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/services/IdentifierFormatterService.java +++ b/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/services/IdentifierFormatterService.java @@ -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# + */ package eu.europa.ec.edelivery.smp.services; @@ -69,7 +87,7 @@ public class IdentifierFormatterService { IdentifierFormatter.Builder builder = IdentifierFormatter.Builder .create() - .addFormatterTypes(new EBCorePartyIdFormatterType());; + .addFormatterTypes(new EBCorePartyIdFormatterType()); // template for formating the identifier List<DBDomainConfiguration> listDomainConf = domainConfigurationDao.getDomainConfiguration(domain); diff --git a/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/services/SMPLanguageResourceService.java b/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/services/SMPLanguageResourceService.java index d3908344960bd70abd403d90fa1b2c033105e97c..595a17cdb11ccce97278f756d6d6b77e878e93bf 100644 --- a/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/services/SMPLanguageResourceService.java +++ b/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/services/SMPLanguageResourceService.java @@ -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# + */ package eu.europa.ec.edelivery.smp.services; import com.fasterxml.jackson.databind.DeserializationFeature; diff --git a/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/services/resource/DocumentVersionService.java b/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/services/resource/DocumentVersionService.java index a11e2e11818cd90a5eb60ffe8a7138ccb5155d8e..b04bff49e028f7ba2d7226f95d1ccb4d78e1d765 100644 --- a/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/services/resource/DocumentVersionService.java +++ b/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/services/resource/DocumentVersionService.java @@ -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# + */ package eu.europa.ec.edelivery.smp.services.resource; import eu.europa.ec.edelivery.smp.auth.SMPUserDetails; diff --git a/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/services/ui/UIDynamicDiscoveryTools.java b/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/services/ui/UIDynamicDiscoveryTools.java index 0aa3636a3173fb5477de1ee5cae66dd8cb07ea03..98815c71c06452e98804eb35b45dca6291a69cbd 100644 --- a/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/services/ui/UIDynamicDiscoveryTools.java +++ b/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/services/ui/UIDynamicDiscoveryTools.java @@ -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# + */ package eu.europa.ec.edelivery.smp.services.ui; import eu.europa.ec.dynamicdiscovery.core.locator.dns.IDNSLookup; diff --git a/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/services/ui/UIReviewService.java b/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/services/ui/UIReviewService.java index e3b0fc38f84a4a43f56a364cf39a7012d12aa0ec..920826274edc6ac061baaab8142eedc96ec9c2ce 100644 --- a/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/services/ui/UIReviewService.java +++ b/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/services/ui/UIReviewService.java @@ -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# + */ package eu.europa.ec.edelivery.smp.services.ui; import eu.europa.ec.edelivery.smp.data.dao.DocumentDao; diff --git a/smp-server-library/src/test/java/eu/europa/ec/edelivery/smp/data/dao/DocumentReferenceSearchTest.java b/smp-server-library/src/test/java/eu/europa/ec/edelivery/smp/data/dao/DocumentReferenceSearchTest.java index 0861adb14bc2d630bed28bc182fc59ab008d9b44..53671f5b4808f396476091456e3b900a7ff04b6d 100644 --- a/smp-server-library/src/test/java/eu/europa/ec/edelivery/smp/data/dao/DocumentReferenceSearchTest.java +++ b/smp-server-library/src/test/java/eu/europa/ec/edelivery/smp/data/dao/DocumentReferenceSearchTest.java @@ -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# + */ package eu.europa.ec.edelivery.smp.data.dao; import eu.europa.ec.edelivery.smp.data.model.doc.DBResource; @@ -15,7 +33,7 @@ import java.util.List; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertNotNull; -public class DocumentReferenceSearchTest extends AbstractBaseDao { +class DocumentReferenceSearchTest extends AbstractBaseDao { @Autowired DocumentDao testInstance; diff --git a/smp-server-library/src/test/java/eu/europa/ec/edelivery/smp/data/dao/TestEntitySearchBasedPermissions.java b/smp-server-library/src/test/java/eu/europa/ec/edelivery/smp/data/dao/TestEntitySearchBasedPermissions.java index a6ac4e6ac5f1d39a0ac589b4a84a6f5d8b0dda22..9c42a7e8f0bd8f12c06e8c7918056378777b2da0 100644 --- a/smp-server-library/src/test/java/eu/europa/ec/edelivery/smp/data/dao/TestEntitySearchBasedPermissions.java +++ b/smp-server-library/src/test/java/eu/europa/ec/edelivery/smp/data/dao/TestEntitySearchBasedPermissions.java @@ -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# + */ package eu.europa.ec.edelivery.smp.data.dao; diff --git a/smp-server-library/src/test/java/eu/europa/ec/edelivery/smp/services/SMPLanguageResourceServiceTest.java b/smp-server-library/src/test/java/eu/europa/ec/edelivery/smp/services/SMPLanguageResourceServiceTest.java index 76b0c7c5e6faa2019c16f4bb242ee236cb946365..6a3f78b093a362e1fdc5707265eb75c37bc4c8d4 100644 --- a/smp-server-library/src/test/java/eu/europa/ec/edelivery/smp/services/SMPLanguageResourceServiceTest.java +++ b/smp-server-library/src/test/java/eu/europa/ec/edelivery/smp/services/SMPLanguageResourceServiceTest.java @@ -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# + */ package eu.europa.ec.edelivery.smp.services; import com.fasterxml.jackson.databind.JsonNode; diff --git a/smp-server-library/src/test/java/eu/europa/ec/edelivery/smp/services/ui/UIDynamicDiscoveryToolsTest.java b/smp-server-library/src/test/java/eu/europa/ec/edelivery/smp/services/ui/UIDynamicDiscoveryToolsTest.java index 1a3703f9d5b447599fc46cedf2bd2d7fd9c54fee..6b5608e027d7e716c06978f3de7d0a4aa31a00b3 100644 --- a/smp-server-library/src/test/java/eu/europa/ec/edelivery/smp/services/ui/UIDynamicDiscoveryToolsTest.java +++ b/smp-server-library/src/test/java/eu/europa/ec/edelivery/smp/services/ui/UIDynamicDiscoveryToolsTest.java @@ -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# + */ package eu.europa.ec.edelivery.smp.services.ui; import eu.europa.ec.edelivery.smp.data.ui.DNSQueryRO; diff --git a/smp-server-library/src/test/java/eu/europa/ec/edelivery/smp/utils/DateUtilsTest.java b/smp-server-library/src/test/java/eu/europa/ec/edelivery/smp/utils/DateUtilsTest.java index 211acecbe0f9371a4de7e65203d1e5f54db49e47..ae06d0e5aa3de1fd326ff252fd4c00b5e14e3179 100644 --- a/smp-server-library/src/test/java/eu/europa/ec/edelivery/smp/utils/DateUtilsTest.java +++ b/smp-server-library/src/test/java/eu/europa/ec/edelivery/smp/utils/DateUtilsTest.java @@ -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# + */ package eu.europa.ec.edelivery.smp.utils; import org.junit.jupiter.params.ParameterizedTest; diff --git a/smp-spi/src/main/java/eu/europa/ec/smp/spi/enums/TransientDocumentPropertyType.java b/smp-spi/src/main/java/eu/europa/ec/smp/spi/enums/TransientDocumentPropertyType.java index 6516501ac2657c4517b67ff9d04185627333e0d4..f584807e7dff6c33ebf898b9bd303755ecb60a57 100644 --- a/smp-spi/src/main/java/eu/europa/ec/smp/spi/enums/TransientDocumentPropertyType.java +++ b/smp-spi/src/main/java/eu/europa/ec/smp/spi/enums/TransientDocumentPropertyType.java @@ -1,7 +1,23 @@ +/*- + * #START_LICENSE# + * smp-spi + * %% + * Copyright (C) 2017 - 2024 European Commission | eDelivery | DomiSMP + * %% + * Licensed 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.smp.spi.enums; -import org.apache.commons.lang3.StringUtils; - import static org.apache.commons.lang3.StringUtils.equalsIgnoreCase; import static org.apache.commons.lang3.StringUtils.trim; diff --git a/smp-webapp/src/main/java/eu/europa/ec/edelivery/smp/ui/external/DNSToolsController.java b/smp-webapp/src/main/java/eu/europa/ec/edelivery/smp/ui/external/DNSToolsController.java index a753fc57e3a91d88ae11b33fdf0d93f85fbb0089..d18c24cbe42b16b489ebb6f9180ebaa8807f09ed 100644 --- a/smp-webapp/src/main/java/eu/europa/ec/edelivery/smp/ui/external/DNSToolsController.java +++ b/smp-webapp/src/main/java/eu/europa/ec/edelivery/smp/ui/external/DNSToolsController.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.ui.external; diff --git a/smp-webapp/src/main/java/eu/europa/ec/edelivery/smp/ui/external/LocaleController.java b/smp-webapp/src/main/java/eu/europa/ec/edelivery/smp/ui/external/LocaleController.java index 9c184efb2066804a3ec9a5a2d3c553dcbbef6298..1a6bf429cf0a13239ab15e820a96a58b1f545ff2 100644 --- a/smp-webapp/src/main/java/eu/europa/ec/edelivery/smp/ui/external/LocaleController.java +++ b/smp-webapp/src/main/java/eu/europa/ec/edelivery/smp/ui/external/LocaleController.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.ui.external; import eu.europa.ec.edelivery.smp.logging.SMPLogger; diff --git a/smp-webapp/src/main/resources/ehcache-default.xml b/smp-webapp/src/main/resources/ehcache-default.xml index c8d67882bd63f66afa6140545fb885900268530a..03d0946e0320e6ddac2741f975fcf02a67cd169c 100644 --- a/smp-webapp/src/main/resources/ehcache-default.xml +++ b/smp-webapp/src/main/resources/ehcache-default.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# + --> + <config xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance' xmlns:jsr107='http://www.ehcache.org/v3/jsr107' diff --git a/smp-webapp/src/test/resources/input/ServiceGroupWithUTF8.xml b/smp-webapp/src/test/resources/input/ServiceGroupWithUTF8.xml index b9231f731ace3b3b2fedcbb41ea1c7c3565bcceb..91b32b5daacf3c85333f54b5f556d67662719bf9 100644 --- a/smp-webapp/src/test/resources/input/ServiceGroupWithUTF8.xml +++ b/smp-webapp/src/test/resources/input/ServiceGroupWithUTF8.xml @@ -1,4 +1,23 @@ <?xml version="1.0" encoding="UTF-8" standalone="no"?> +<!-- + #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# + --> + <ServiceGroup xmlns="http://docs.oasis-open.org/bdxr/ns/SMP/2016/05"> <ParticipantIdentifier scheme="${resource.identifier.scheme}">${resource.identifier.value}</ParticipantIdentifier> <ServiceMetadataReferenceCollection/> diff --git a/smp-webapp/src/test/resources/input/ServiceMetadata.xml b/smp-webapp/src/test/resources/input/ServiceMetadata.xml index e815bd68d59352ec2727dc8412b38623a2a82525..38624ee0a949e8f8c3a5c33ab3edb862f7f68ffe 100644 --- a/smp-webapp/src/test/resources/input/ServiceMetadata.xml +++ b/smp-webapp/src/test/resources/input/ServiceMetadata.xml @@ -1,4 +1,23 @@ <?xml version="1.0" encoding="UTF-8" standalone="no"?> +<!-- + #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# + --> + <ServiceMetadata xmlns="http://docs.oasis-open.org/bdxr/ns/SMP/2016/05"> <ServiceInformation> <ParticipantIdentifier scheme="ehealth-actorid-qns">urn:australia:ncpb</ParticipantIdentifier> diff --git a/smp-webapp/src/test/resources/input/ServiceMetadata_linarized.xml b/smp-webapp/src/test/resources/input/ServiceMetadata_linarized.xml index 9c5c59a833655683277f9fa83d47eec8ed8b1dbb..3b4784e11b11f2d4a134ee52bf814e79901a872f 100644 --- a/smp-webapp/src/test/resources/input/ServiceMetadata_linarized.xml +++ b/smp-webapp/src/test/resources/input/ServiceMetadata_linarized.xml @@ -1,2 +1,21 @@ <?xml version="1.0" encoding="UTF-8" standalone="no"?> +<!-- + #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# + --> + <ServiceMetadata xmlns="http://docs.oasis-open.org/bdxr/ns/SMP/2016/05"><ServiceInformation><ParticipantIdentifier scheme="ehealth-actorid-qns">urn:brazil:ncpb</ParticipantIdentifier><DocumentIdentifier scheme="ehealth-resid-qns">urn::epsos##services:extended:epsos::107</DocumentIdentifier><ProcessList><Process><ProcessIdentifier scheme="ehealth-procid-qns">urn:epsosPatientService::List</ProcessIdentifier><ServiceEndpointList><Endpoint transportProfile="urn:ihe:iti:2013:xcpd"><EndpointURI>http://poland.pl/ncp/patient/list</EndpointURI><RequireBusinessLevelSignature>false</RequireBusinessLevelSignature><MinimumAuthenticationLevel>urn:epSOS:loa:1</MinimumAuthenticationLevel><ServiceActivationDate>2016-06-06T11:06:02.000+02:00</ServiceActivationDate><ServiceExpirationDate>2026-06-06T11:06:02+02:00</ServiceExpirationDate><Certificate>MIID7jCCA1egAwIBAgICA+YwDQYJKoZIhvcNAQENBQAwOjELMAkGA1UEBhMCRlIxEzARBgNVBAoMCklIRSBFdXJvcGUxFjAUBgNVBAMMDUlIRSBFdXJvcGUgQ0EwHhcNMTYwNjAxMTQzNTUzWhcNMjYwNjAxMTQzNTUzWjCBgzELMAkGA1UEBhMCUFQxDDAKBgNVBAoMA01vSDENMAsGA1UECwwEU1BNUzENMAsGA1UEKgwESm9hbzEOMAwGA1UEBRMFQ3VuaGExHTAbBgNVBAMMFHFhZXBzb3MubWluLXNhdWRlLnB0MRkwFwYDVQQMDBBTZXJ2aWNlIFByb3ZpZGVyMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA1eN4qPSSRZqjVFG9TlcPlxf2WiSimQK9L1nf9Z/s0ezeGQjCukDeDq/Wzqd9fpHhaMMq+XSSOtyEtIr5K/As4kFrViONUUkG12J6UllSWogp0NYFwA4wIqKSFiTnQS5/nRTs05oONCCGILCyJNNeO53JzPlaq3/QbPLssuSAr6XucPE8wBBGM8b/TsB2G/zjG8yuSTgGbhaZekq/Vnf9ftj1fr/vJDDAQgH6Yvzd88Z0DACJPHfW1p4F/OWLI386Bq7g/bo1DUPAyEwlf+CkLgJWRKki3yJlOCIZ9enMA5O7rfeG3rXdgYGmWS7tNEgKXxgC+heiYvi7ZWd7M+/SUwIDAQABo4IBMzCCAS8wPgYDVR0fBDcwNTAzoDGgL4YtaHR0cHM6Ly9nYXplbGxlLmloZS5uZXQvcGtpL2NybC82NDMvY2FjcmwuY3JsMDwGCWCGSAGG+EIBBAQvFi1odHRwczovL2dhemVsbGUuaWhlLm5ldC9wa2kvY3JsLzY0My9jYWNybC5jcmwwPAYJYIZIAYb4QgEDBC8WLWh0dHBzOi8vZ2F6ZWxsZS5paGUubmV0L3BraS9jcmwvNjQzL2NhY3JsLmNybDAfBgNVHSMEGDAWgBTsMw4TyCJeouFrr0N7el3Sd3MdfjAdBgNVHQ4EFgQU1GQ/K1ykIwWFgiONzWJLQzufF/8wDAYDVR0TAQH/BAIwADAOBgNVHQ8BAf8EBAMCBSAwEwYDVR0lBAwwCgYIKwYBBQUHAwEwDQYJKoZIhvcNAQENBQADgYEAZ7t1Qkr9wz3q6+WcF6p/YX7Jr0CzVe7w58FvJFk2AsHeYkSlOyO5hxNpQbs1L1v6JrcqziNFrh2QKGT2v6iPdWtdCT8HBLjmuvVWxxnfzYjdQ0J+kdKMAEV6EtWU78OqL60CCtUZKXE/NKJUq7TTUCFP2fwiARy/t1dTD2NZo8c=</Certificate><ServiceDescription>This is the epSOS Patient Service List for the Polish NCP</ServiceDescription><TechnicalContactUrl>http://poland.pl/contact</TechnicalContactUrl><TechnicalInformationUrl>http://poland.pl/contact</TechnicalInformationUrl></Endpoint></ServiceEndpointList></Process></ProcessList><Extension></Extension></ServiceInformation></ServiceMetadata>