diff --git a/LICENCE-EUPL-v1.1.pdf b/LICENCE-EUPL-v1.1.pdf
deleted file mode 100644
index 80b5007ed2349dda087424659c75eb30b7321641..0000000000000000000000000000000000000000
Binary files a/LICENCE-EUPL-v1.1.pdf and /dev/null differ
diff --git a/LICENCE-EUPL-v1.2.pdf b/LICENCE-EUPL-v1.2.pdf
new file mode 100644
index 0000000000000000000000000000000000000000..b3abd455b503762e7410fd98561613fec719706e
Binary files /dev/null and b/LICENCE-EUPL-v1.2.pdf differ
diff --git a/pom.xml b/pom.xml
index e113fa718c0d7d632874e40b6d7d8fc5027d7b3b..9bec7b6234cef83683d8e5e3de6fa23a686647c3 100644
--- a/pom.xml
+++ b/pom.xml
@@ -2,12 +2,10 @@
<!--
~ Copyright 2017 European Commission | CEF eDelivery
~
- ~ Licensed under the EUPL, Version 1.1 or – as soon they will be approved by the European Commission - subsequent versions of the EUPL (the "Licence");
+ ~ Licensed 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:
- ~ https://joinup.ec.europa.eu/software/page/eupl
- ~ or file: LICENCE-EUPL-v1.1.pdf
+ ~ You may obtain a copy of the Licence attached in file: LICENCE-EUPL-v1.2.pdf
~
~ 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.
diff --git a/smp-api/pom.xml b/smp-api/pom.xml
index c46d03a58c9623b900afe4486ec97fab9a7326ce..696995146e708ffaab7f1ff12b41cbb8c29f430c 100644
--- a/smp-api/pom.xml
+++ b/smp-api/pom.xml
@@ -2,12 +2,10 @@
<!--
~ Copyright 2017 European Commission | CEF eDelivery
~
- ~ Licensed under the EUPL, Version 1.1 or – as soon they will be approved by the European Commission - subsequent versions of the EUPL (the "Licence");
+ ~ Licensed 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:
- ~ https://joinup.ec.europa.eu/software/page/eupl
- ~ or file: LICENCE-EUPL-v1.1.pdf
+ ~ You may obtain a copy of the Licence attached in file: LICENCE-EUPL-v1.2.pdf
~
~ 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.
diff --git a/smp-api/src/main/java/eu/europa/ec/smp/api/Identifiers.java b/smp-api/src/main/java/eu/europa/ec/smp/api/Identifiers.java
index 5f4a2c571a107000df10a96b1e165079d4c195e7..42cf810fd5e7997ff0ae9f3d4e498ba401e0bddb 100644
--- a/smp-api/src/main/java/eu/europa/ec/smp/api/Identifiers.java
+++ b/smp-api/src/main/java/eu/europa/ec/smp/api/Identifiers.java
@@ -1,12 +1,10 @@
/*
* Copyright 2017 European Commission | CEF eDelivery
*
- * Licensed under the EUPL, Version 1.1 or – as soon they will be approved by the European Commission - subsequent versions of the EUPL (the "Licence");
+ * Licensed 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:
- * https://joinup.ec.europa.eu/software/page/eupl
- * or file: LICENCE-EUPL-v1.1.pdf
+ * You may obtain a copy of the Licence attached in file: LICENCE-EUPL-v1.2.pdf
*
* 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.
diff --git a/smp-api/src/main/java/eu/europa/ec/smp/api/exceptions/MalformedIdentifierException.java b/smp-api/src/main/java/eu/europa/ec/smp/api/exceptions/MalformedIdentifierException.java
index f25a561e9ecb6f45b6908f25c64f36540ea93c4d..bd808706b591bc42f4fdd4d8afc6eedc79a73b69 100644
--- a/smp-api/src/main/java/eu/europa/ec/smp/api/exceptions/MalformedIdentifierException.java
+++ b/smp-api/src/main/java/eu/europa/ec/smp/api/exceptions/MalformedIdentifierException.java
@@ -1,12 +1,10 @@
/*
* Copyright 2017 European Commission | CEF eDelivery
*
- * Licensed under the EUPL, Version 1.1 or – as soon they will be approved by the European Commission - subsequent versions of the EUPL (the "Licence");
+ * Licensed 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:
- * https://joinup.ec.europa.eu/software/page/eupl
- * or file: LICENCE-EUPL-v1.1.pdf
+ * You may obtain a copy of the Licence attached in file: LICENCE-EUPL-v1.2.pdf
*
* 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.
diff --git a/smp-api/src/main/java/eu/europa/ec/smp/api/exceptions/XmlInvalidAgainstSchemaException.java b/smp-api/src/main/java/eu/europa/ec/smp/api/exceptions/XmlInvalidAgainstSchemaException.java
index 42092253c7419438587f53aa1245a91ee6f46d50..2df96fe77c9f38aca31548c21bebd435027118ca 100644
--- a/smp-api/src/main/java/eu/europa/ec/smp/api/exceptions/XmlInvalidAgainstSchemaException.java
+++ b/smp-api/src/main/java/eu/europa/ec/smp/api/exceptions/XmlInvalidAgainstSchemaException.java
@@ -1,12 +1,10 @@
/*
* Copyright 2017 European Commission | CEF eDelivery
*
- * Licensed under the EUPL, Version 1.1 or – as soon they will be approved by the European Commission - subsequent versions of the EUPL (the "Licence");
+ * Licensed 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:
- * https://joinup.ec.europa.eu/software/page/eupl
- * or file: LICENCE-EUPL-v1.1.pdf
+ * You may obtain a copy of the Licence attached in file: LICENCE-EUPL-v1.2.pdf
*
* 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.
diff --git a/smp-api/src/main/java/eu/europa/ec/smp/api/validators/BdxSmpOasisValidator.java b/smp-api/src/main/java/eu/europa/ec/smp/api/validators/BdxSmpOasisValidator.java
index 87ff33128de286446c0bc3d1ab99f5a088daa124..26aceb1b6831a714c39da5f4f900bcf21eb5692d 100644
--- a/smp-api/src/main/java/eu/europa/ec/smp/api/validators/BdxSmpOasisValidator.java
+++ b/smp-api/src/main/java/eu/europa/ec/smp/api/validators/BdxSmpOasisValidator.java
@@ -1,12 +1,10 @@
/*
* Copyright 2017 European Commission | CEF eDelivery
*
- * Licensed under the EUPL, Version 1.1 or – as soon they will be approved by the European Commission - subsequent versions of the EUPL (the "Licence");
+ * Licensed 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:
- * https://joinup.ec.europa.eu/software/page/eupl
- * or file: LICENCE-EUPL-v1.1.pdf
+ * You may obtain a copy of the Licence attached in file: LICENCE-EUPL-v1.2.pdf
*
* 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.
diff --git a/smp-api/src/main/resources/bdx-smp-201605.xsd b/smp-api/src/main/resources/bdx-smp-201605.xsd
index 4b1daa88442987ec0fa4a7f7739a98b300d6dc49..39f98b365d4dbe2f59c0911fdd9233c2ebb26638 100644
--- a/smp-api/src/main/resources/bdx-smp-201605.xsd
+++ b/smp-api/src/main/resources/bdx-smp-201605.xsd
@@ -7,7 +7,7 @@
Source: http://docs.oasis-open.org/bdxr/bdx-smp/v1.0/cs03/schemas/
Latest version of the specification: http://docs.oasis-open.org/bdxr/bdx-smp/v1.0/bdx-smp-v1.0.html
TC IPR Statement: https://www.oasis-open.org/committees/bdxr/ipr.php
- -->
+ -->
<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns="http://docs.oasis-open.org/bdxr/ns/SMP/2016/05" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" elementFormDefault="qualified" targetNamespace="http://docs.oasis-open.org/bdxr/ns/SMP/2016/05" id="ServiceMetadataPublishing">
<xs:import namespace="http://www.w3.org/2000/09/xmldsig#" schemaLocation="xmldsig-core-schema.xsd"/>
<xs:element name="ServiceGroup" type="ServiceGroupType"/>
diff --git a/smp-api/src/main/resources/commonServiceBinding.xjb b/smp-api/src/main/resources/commonServiceBinding.xjb
index c270cf2658316e5adc42fd15f12f6e9b26dbd61d..cfefdeb35f5b28025a2d9d574a67864de9eec428 100644
--- a/smp-api/src/main/resources/commonServiceBinding.xjb
+++ b/smp-api/src/main/resources/commonServiceBinding.xjb
@@ -2,12 +2,10 @@
<!--
~ Copyright 2017 European Commission | CEF eDelivery
~
- ~ Licensed under the EUPL, Version 1.1 or – as soon they will be approved by the European Commission - subsequent versions of the EUPL (the "Licence");
+ ~ Licensed 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:
- ~ https://joinup.ec.europa.eu/software/page/eupl
- ~ or file: LICENCE-EUPL-v1.1.pdf
+ ~ You may obtain a copy of the Licence attached in file: LICENCE-EUPL-v1.2.pdf
~
~ 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.
diff --git a/smp-api/src/main/resources/ec-services-SMP-1.0.xsd b/smp-api/src/main/resources/ec-services-SMP-1.0.xsd
index 184fe636868b2af4bac34f21c06c8fb5ef26e57a..35fa43f06cc371abf778bda6536dc4afceac6bce 100644
--- a/smp-api/src/main/resources/ec-services-SMP-1.0.xsd
+++ b/smp-api/src/main/resources/ec-services-SMP-1.0.xsd
@@ -2,12 +2,10 @@
<!--
~ Copyright 2017 European Commission | CEF eDelivery
~
- ~ Licensed under the EUPL, Version 1.1 or – as soon they will be approved by the European Commission - subsequent versions of the EUPL (the "Licence");
+ ~ Licensed 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:
- ~ https://joinup.ec.europa.eu/software/page/eupl
- ~ or file: LICENCE-EUPL-v1.1.pdf
+ ~ You may obtain a copy of the Licence attached in file: LICENCE-EUPL-v1.2.pdf
~
~ 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.
diff --git a/smp-api/src/main/resources/org-w3-2001-xmlschema.xsd b/smp-api/src/main/resources/org-w3-2001-xmlschema.xsd
index 1777801100a3f3187bc30bf92ee54b8b25422e45..3e4877c1e346e1deb77c084879afa675f8c95825 100644
--- a/smp-api/src/main/resources/org-w3-2001-xmlschema.xsd
+++ b/smp-api/src/main/resources/org-w3-2001-xmlschema.xsd
@@ -2,12 +2,10 @@
<!--
~ Copyright 2017 European Commission | CEF eDelivery
~
- ~ Licensed under the EUPL, Version 1.1 or – as soon they will be approved by the European Commission - subsequent versions of the EUPL (the "Licence");
+ ~ Licensed 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:
- ~ https://joinup.ec.europa.eu/software/page/eupl
- ~ or file: LICENCE-EUPL-v1.1.pdf
+ ~ You may obtain a copy of the Licence attached in file: LICENCE-EUPL-v1.2.pdf
~
~ 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.
diff --git a/smp-api/src/main/resources/xmldsig-core-schema.xsd b/smp-api/src/main/resources/xmldsig-core-schema.xsd
index c937bb804062a49971a25349fc785a739aa8ab61..db6114e859aa7ee7c178f957e7fbe306d38857b6 100644
--- a/smp-api/src/main/resources/xmldsig-core-schema.xsd
+++ b/smp-api/src/main/resources/xmldsig-core-schema.xsd
@@ -23,7 +23,7 @@
[1] http://www.w3.org/Consortium/Legal/copyright-software-19980720
[2] http://www.w3.org/Consortium/Legal/IPR-FAQ-20000620.html#DTD
-->
-<schema xmlns="http://www.w3.org/2001/XMLSchema" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" targetNamespace="http://www.w3.org/2000/09/xmldsig#" version="0.1" elementFormDefault="qualified">
+<schema xmlns="http://www.w3.org/2001/XMLSchema" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" targetNamespace="http://www.w3.org/2000/09/xmldsig#" version="0.1" elementFormDefault="qualified">
<!-- Basic Types Defined for Signatures -->
diff --git a/smp-api/src/test/java/eu/europa/ec/smp/api/GeneratedCodeTest.java b/smp-api/src/test/java/eu/europa/ec/smp/api/GeneratedCodeTest.java
index 046eab2fb9626e42587cab9759e7c741fe3aa1e1..d9039e75e122013d14e3cf27b5832d6fa51114b4 100644
--- a/smp-api/src/test/java/eu/europa/ec/smp/api/GeneratedCodeTest.java
+++ b/smp-api/src/test/java/eu/europa/ec/smp/api/GeneratedCodeTest.java
@@ -1,3 +1,16 @@
+/*
+ * Copyright 2017 European Commission | CEF eDelivery
+ *
+ * Licensed 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 attached in file: LICENCE-EUPL-v1.2.pdf
+ *
+ * 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.
+ */
+
package eu.europa.ec.smp.api;
import org.junit.Test;
diff --git a/smp-api/src/test/java/eu/europa/ec/smp/api/IdentifiersTest.java b/smp-api/src/test/java/eu/europa/ec/smp/api/IdentifiersTest.java
index 5b1064607286969610ffed3a1f282868fee006a7..8d639f045b17616bcde950599928645bc9a1be03 100644
--- a/smp-api/src/test/java/eu/europa/ec/smp/api/IdentifiersTest.java
+++ b/smp-api/src/test/java/eu/europa/ec/smp/api/IdentifiersTest.java
@@ -1,3 +1,16 @@
+/*
+ * Copyright 2017 European Commission | CEF eDelivery
+ *
+ * Licensed 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 attached in file: LICENCE-EUPL-v1.2.pdf
+ *
+ * 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.
+ */
+
package eu.europa.ec.smp.api;
import eu.europa.ec.smp.api.exceptions.MalformedIdentifierException;
diff --git a/smp-api/src/test/java/eu/europa/ec/smp/api/validators/BdxSmpOasisValidatorTest.java b/smp-api/src/test/java/eu/europa/ec/smp/api/validators/BdxSmpOasisValidatorTest.java
index bc169888c8f7a569192cdc16ab44bd725be3cd31..a45d7215902da46bcb0649d2391fbb42777d0e35 100644
--- a/smp-api/src/test/java/eu/europa/ec/smp/api/validators/BdxSmpOasisValidatorTest.java
+++ b/smp-api/src/test/java/eu/europa/ec/smp/api/validators/BdxSmpOasisValidatorTest.java
@@ -1,3 +1,16 @@
+/*
+ * Copyright 2017 European Commission | CEF eDelivery
+ *
+ * Licensed 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 attached in file: LICENCE-EUPL-v1.2.pdf
+ *
+ * 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.
+ */
+
package eu.europa.ec.smp.api.validators;
import eu.europa.ec.smp.api.exceptions.XmlInvalidAgainstSchemaException;
diff --git a/smp-api/src/test/resources/ServiceGroupA.xml b/smp-api/src/test/resources/ServiceGroupA.xml
index e76019c2760ca31191eb3936296c5d2219852f80..9984d1d859c2cda5f10eabd62390b4063a8e26cd 100644
--- a/smp-api/src/test/resources/ServiceGroupA.xml
+++ b/smp-api/src/test/resources/ServiceGroupA.xml
@@ -1,4 +1,17 @@
<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ ~ Copyright 2017 European Commission | CEF eDelivery
+ ~
+ ~ Licensed 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 attached in file: LICENCE-EUPL-v1.2.pdf
+ ~
+ ~ 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.
+ -->
+
<ServiceGroup xmlns="http://docs.oasis-open.org/bdxr/ns/SMP/2016/05">
<ParticipantIdentifier scheme="ehealth-actorid-qns">urn:poland:ncpb</ParticipantIdentifier>
<!-- sample comment -->
diff --git a/smp-api/src/test/resources/ServiceGroupB.xml b/smp-api/src/test/resources/ServiceGroupB.xml
index ba0672b8520ce4444df9f2c1d03ed7b5cb76fb97..c39c43a1c90dcbbd167ca6dc2af988ed1437f4a5 100644
--- a/smp-api/src/test/resources/ServiceGroupB.xml
+++ b/smp-api/src/test/resources/ServiceGroupB.xml
@@ -1 +1,14 @@
-<?xml version="1.0" encoding="UTF-8"?><ServiceGroup xmlns="http://docs.oasis-open.org/bdxr/ns/SMP/2016/05"><ParticipantIdentifier scheme="ehealth-actorid-qns">urn:poland:ncpb</ParticipantIdentifier><ServiceMetadataReferenceCollection><ServiceMetadataReference href="http://smp-digit-mock.publisher.ehealth.acc.edelivery.tech.ec.europa.eu/ehealth-actorid-qns::urn:poland:ncpb/services/epsos-docid-qns%3A%3Aurn%3A%3Aepsos%3Aservices%23%23epsos-21" /><ServiceMetadataReference href="http://smp-digit-mock.publisher.ehealth.acc.edelivery.tech.ec.europa.eu/ehealth-actorid-qns::urn:poland:ncpb/services/ehealth-resid-qns%3A%3Aurn%3A%3Aepsos%23%23services%3Aextended%3Aepsos%3A%3A107" /></ServiceMetadataReferenceCollection></ServiceGroup>
\ No newline at end of file
+<?xml version="1.0" encoding="UTF-8"?><!--
+ ~ Copyright 2017 European Commission | CEF eDelivery
+ ~
+ ~ Licensed 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 attached in file: LICENCE-EUPL-v1.2.pdf
+ ~
+ ~ 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.
+ -->
+
+<ServiceGroup xmlns="http://docs.oasis-open.org/bdxr/ns/SMP/2016/05"><ParticipantIdentifier scheme="ehealth-actorid-qns">urn:poland:ncpb</ParticipantIdentifier><ServiceMetadataReferenceCollection><ServiceMetadataReference href="http://smp-digit-mock.publisher.ehealth.acc.edelivery.tech.ec.europa.eu/ehealth-actorid-qns::urn:poland:ncpb/services/epsos-docid-qns%3A%3Aurn%3A%3Aepsos%3Aservices%23%23epsos-21" /><ServiceMetadataReference href="http://smp-digit-mock.publisher.ehealth.acc.edelivery.tech.ec.europa.eu/ehealth-actorid-qns::urn:poland:ncpb/services/ehealth-resid-qns%3A%3Aurn%3A%3Aepsos%23%23services%3Aextended%3Aepsos%3A%3A107" /></ServiceMetadataReferenceCollection></ServiceGroup>
\ No newline at end of file
diff --git a/smp-api/src/test/resources/ServiceGroupC.xml b/smp-api/src/test/resources/ServiceGroupC.xml
index d7dc358d52928d0556f82a6de51f4b689fb346b2..3b8510f90cae5876123da8825da808bccd702c9c 100644
--- a/smp-api/src/test/resources/ServiceGroupC.xml
+++ b/smp-api/src/test/resources/ServiceGroupC.xml
@@ -1,4 +1,17 @@
<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ ~ Copyright 2017 European Commission | CEF eDelivery
+ ~
+ ~ Licensed 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 attached in file: LICENCE-EUPL-v1.2.pdf
+ ~
+ ~ 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.
+ -->
+
<ServiceGroup xmlns="http://docs.oasis-open.org/bdxr/ns/SMP/2016/05">
<ParticipantIdentifier scheme="ehealth-actorid-qns">urn:poland:ncpb</ParticipantIdentifier>
<!-- sample comment -->
diff --git a/smp-api/src/test/resources/XMLValidation/ServiceGroup_MissingAssignment.xml b/smp-api/src/test/resources/XMLValidation/ServiceGroup_MissingAssignment.xml
index d78d637ef2e58b42eb9b2ed650c0f3b44cbc2645..1ec660c59d78116e9268c33bc3d85bc5042343a6 100644
--- a/smp-api/src/test/resources/XMLValidation/ServiceGroup_MissingAssignment.xml
+++ b/smp-api/src/test/resources/XMLValidation/ServiceGroup_MissingAssignment.xml
@@ -1,4 +1,17 @@
<?xml version="1.0" encoding="utf-8"?>
+<!--
+ ~ Copyright 2017 European Commission | CEF eDelivery
+ ~
+ ~ Licensed 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 attached in file: LICENCE-EUPL-v1.2.pdf
+ ~
+ ~ 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.
+ -->
+
<ServiceGroup xmlns="http://docs.oasis-open.org/bdxr/ns/SMP/2016/05"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://docs.oasis-open.org/bdxr/ns/SMP/2016/05">
diff --git a/smp-api/src/test/resources/XMLValidation/ServiceGroup_OK.xml b/smp-api/src/test/resources/XMLValidation/ServiceGroup_OK.xml
index fffcb5bbd8e677d0f1ca7b70bc89159fd44aec6f..c66680275b4d2671486a0db0c13cec23c26bdb29 100644
--- a/smp-api/src/test/resources/XMLValidation/ServiceGroup_OK.xml
+++ b/smp-api/src/test/resources/XMLValidation/ServiceGroup_OK.xml
@@ -1,4 +1,17 @@
<?xml version="1.0" encoding="utf-8"?>
+<!--
+ ~ Copyright 2017 European Commission | CEF eDelivery
+ ~
+ ~ Licensed 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 attached in file: LICENCE-EUPL-v1.2.pdf
+ ~
+ ~ 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.
+ -->
+
<ServiceGroup xmlns="http://docs.oasis-open.org/bdxr/ns/SMP/2016/05"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://docs.oasis-open.org/bdxr/ns/SMP/2016/05">
diff --git a/smp-api/src/test/resources/XMLValidation/ServiceGroup_UnexpectedAttribute.xml b/smp-api/src/test/resources/XMLValidation/ServiceGroup_UnexpectedAttribute.xml
index 667bf5be8d40e6f0956d68b06f0e1a620859dc2f..4256fbd5219008e5a7de19a4882f93fa6a1eaf95 100644
--- a/smp-api/src/test/resources/XMLValidation/ServiceGroup_UnexpectedAttribute.xml
+++ b/smp-api/src/test/resources/XMLValidation/ServiceGroup_UnexpectedAttribute.xml
@@ -1,4 +1,17 @@
<?xml version="1.0" encoding="utf-8"?>
+<!--
+ ~ Copyright 2017 European Commission | CEF eDelivery
+ ~
+ ~ Licensed 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 attached in file: LICENCE-EUPL-v1.2.pdf
+ ~
+ ~ 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.
+ -->
+
<ServiceGroup xmlns="http://docs.oasis-open.org/bdxr/ns/SMP/2016/05"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://docs.oasis-open.org/bdxr/ns/SMP/2016/05">
diff --git a/smp-api/src/test/resources/XMLValidation/ServiceGroup_externalDTD.xml b/smp-api/src/test/resources/XMLValidation/ServiceGroup_externalDTD.xml
index fda1b0b96ee612240c46691bf112a74d8412ecbc..512545433bfb213e2bf283947a626a05fc6371e9 100644
--- a/smp-api/src/test/resources/XMLValidation/ServiceGroup_externalDTD.xml
+++ b/smp-api/src/test/resources/XMLValidation/ServiceGroup_externalDTD.xml
@@ -1,4 +1,17 @@
<?xml version="1.0" encoding="utf-8"?>
+<!--
+ ~ Copyright 2017 European Commission | CEF eDelivery
+ ~
+ ~ Licensed 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 attached in file: LICENCE-EUPL-v1.2.pdf
+ ~
+ ~ 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.
+ -->
+
<!DOCTYPE externaladdress SYSTEM "any_external_file_address.dtd">
<ServiceGroup xmlns="http://docs.oasis-open.org/bdxr/ns/SMP/2016/05"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
diff --git a/smp-api/src/test/resources/XMLValidation/ServiceMetadata_ElementAdded.xml b/smp-api/src/test/resources/XMLValidation/ServiceMetadata_ElementAdded.xml
index b685f9d4b339805a1b38f121438d76b88d5cf5da..6159e85a4996ece49582079f4d1fe7ab1470919d 100644
--- a/smp-api/src/test/resources/XMLValidation/ServiceMetadata_ElementAdded.xml
+++ b/smp-api/src/test/resources/XMLValidation/ServiceMetadata_ElementAdded.xml
@@ -1,4 +1,17 @@
<?xml version="1.0" encoding="utf-8"?>
+<!--
+ ~ Copyright 2017 European Commission | CEF eDelivery
+ ~
+ ~ Licensed 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 attached in file: LICENCE-EUPL-v1.2.pdf
+ ~
+ ~ 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.
+ -->
+
<ServiceMetadata xmlns="http://docs.oasis-open.org/bdxr/ns/SMP/2016/05"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://docs.oasis-open.org/bdxr/ns/SMP/2016/05">
diff --git a/smp-api/src/test/resources/XMLValidation/ServiceMetadata_ElementMissing.xml b/smp-api/src/test/resources/XMLValidation/ServiceMetadata_ElementMissing.xml
index d86ed31ffb4f9bbbe312e1cd20b867e9c2ea3c7d..50ae9e1c38cc00401ffe0f39ba871bacfed16cab 100644
--- a/smp-api/src/test/resources/XMLValidation/ServiceMetadata_ElementMissing.xml
+++ b/smp-api/src/test/resources/XMLValidation/ServiceMetadata_ElementMissing.xml
@@ -1,4 +1,17 @@
<?xml version="1.0" encoding="utf-8"?>
+<!--
+ ~ Copyright 2017 European Commission | CEF eDelivery
+ ~
+ ~ Licensed 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 attached in file: LICENCE-EUPL-v1.2.pdf
+ ~
+ ~ 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.
+ -->
+
<ServiceMetadata xmlns="http://docs.oasis-open.org/bdxr/ns/SMP/2016/05"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://docs.oasis-open.org/bdxr/ns/SMP/2016/05">
diff --git a/smp-api/src/test/resources/XMLValidation/ServiceMetadata_OK.xml b/smp-api/src/test/resources/XMLValidation/ServiceMetadata_OK.xml
index 77ed4ac755c4e2d18684878eab840fb2f120339a..549a1c009a6d2547c2c76d00a851b64523cdce7e 100644
--- a/smp-api/src/test/resources/XMLValidation/ServiceMetadata_OK.xml
+++ b/smp-api/src/test/resources/XMLValidation/ServiceMetadata_OK.xml
@@ -1,4 +1,17 @@
<?xml version="1.0" encoding="utf-8"?>
+<!--
+ ~ Copyright 2017 European Commission | CEF eDelivery
+ ~
+ ~ Licensed 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 attached in file: LICENCE-EUPL-v1.2.pdf
+ ~
+ ~ 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.
+ -->
+
<ServiceMetadata xmlns="http://docs.oasis-open.org/bdxr/ns/SMP/2016/05"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://docs.oasis-open.org/bdxr/ns/SMP/2016/05">
diff --git a/smp-parent-pom/pom.xml b/smp-parent-pom/pom.xml
index 69f8ff8fc6318bb69332bb7a257b620ab5795c54..870d37807ac3b2af1d96cdb725355d4fc0258fe6 100644
--- a/smp-parent-pom/pom.xml
+++ b/smp-parent-pom/pom.xml
@@ -2,12 +2,10 @@
<!--
~ Copyright 2017 European Commission | CEF eDelivery
~
- ~ Licensed under the EUPL, Version 1.1 or – as soon they will be approved by the European Commission - subsequent versions of the EUPL (the "Licence");
+ ~ Licensed 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:
- ~ https://joinup.ec.europa.eu/software/page/eupl
- ~ or file: LICENCE-EUPL-v1.1.pdf
+ ~ You may obtain a copy of the Licence attached in file: LICENCE-EUPL-v1.2.pdf
~
~ 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.
diff --git a/smp-parent-pom/settings.xml b/smp-parent-pom/settings.xml
index 36b3db9617cce90720f24bbfe5479d0679ced70c..a35361e82fa1c3a9be367381a93534b200e9b8b9 100644
--- a/smp-parent-pom/settings.xml
+++ b/smp-parent-pom/settings.xml
@@ -1,12 +1,10 @@
<!--
~ Copyright 2017 European Commission | CEF eDelivery
~
- ~ Licensed under the EUPL, Version 1.1 or – as soon they will be approved by the European Commission - subsequent versions of the EUPL (the "Licence");
+ ~ Licensed 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:
- ~ https://joinup.ec.europa.eu/software/page/eupl
- ~ or file: LICENCE-EUPL-v1.1.pdf
+ ~ You may obtain a copy of the Licence attached in file: LICENCE-EUPL-v1.2.pdf
~
~ 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.
diff --git a/smp-server-library/pom.xml b/smp-server-library/pom.xml
index ce55dc344b6c70269c54a6044b87dab7199a89db..45a86b3b06eff29c6fd39a6b1a6e941e0fad3313 100644
--- a/smp-server-library/pom.xml
+++ b/smp-server-library/pom.xml
@@ -1,12 +1,10 @@
<!--
~ Copyright 2017 European Commission | CEF eDelivery
~
- ~ Licensed under the EUPL, Version 1.1 or – as soon they will be approved by the European Commission - subsequent versions of the EUPL (the "Licence");
+ ~ Licensed 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:
- ~ https://joinup.ec.europa.eu/software/page/eupl
- ~ or file: LICENCE-EUPL-v1.1.pdf
+ ~ You may obtain a copy of the Licence attached in file: LICENCE-EUPL-v1.2.pdf
~
~ 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.
diff --git a/smp-server-library/src/main/java/eu/europa/ec/cipa/smp/server/conversion/CaseSensitivityNormalizer.java b/smp-server-library/src/main/java/eu/europa/ec/cipa/smp/server/conversion/CaseSensitivityNormalizer.java
index 192ae66095561e80f16775476fba29fa2cdd58dd..b2b2f65b1b90f98cec96359931489f2cf9e8be2d 100644
--- a/smp-server-library/src/main/java/eu/europa/ec/cipa/smp/server/conversion/CaseSensitivityNormalizer.java
+++ b/smp-server-library/src/main/java/eu/europa/ec/cipa/smp/server/conversion/CaseSensitivityNormalizer.java
@@ -1,12 +1,10 @@
/*
* Copyright 2017 European Commission | CEF eDelivery
*
- * Licensed under the EUPL, Version 1.1 or – as soon they will be approved by the European Commission - subsequent versions of the EUPL (the "Licence");
+ * Licensed 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:
- * https://joinup.ec.europa.eu/software/page/eupl
- * or file: LICENCE-EUPL-v1.1.pdf
+ * You may obtain a copy of the Licence attached in file: LICENCE-EUPL-v1.2.pdf
*
* 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.
diff --git a/smp-server-library/src/main/java/eu/europa/ec/cipa/smp/server/conversion/ServiceGroupConverter.java b/smp-server-library/src/main/java/eu/europa/ec/cipa/smp/server/conversion/ServiceGroupConverter.java
index 0a9b0e10e2e5983f1b6aca9a33e18c75e335988a..22cc7d6957a90995cfa73cf1efd4ed4a218427ad 100644
--- a/smp-server-library/src/main/java/eu/europa/ec/cipa/smp/server/conversion/ServiceGroupConverter.java
+++ b/smp-server-library/src/main/java/eu/europa/ec/cipa/smp/server/conversion/ServiceGroupConverter.java
@@ -1,12 +1,10 @@
/*
* Copyright 2017 European Commission | CEF eDelivery
*
- * Licensed under the EUPL, Version 1.1 or – as soon they will be approved by the European Commission - subsequent versions of the EUPL (the "Licence");
+ * Licensed 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:
- * https://joinup.ec.europa.eu/software/page/eupl
- * or file: LICENCE-EUPL-v1.1.pdf
+ * You may obtain a copy of the Licence attached in file: LICENCE-EUPL-v1.2.pdf
*
* 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.
diff --git a/smp-server-library/src/main/java/eu/europa/ec/cipa/smp/server/conversion/ServiceMetadataConverter.java b/smp-server-library/src/main/java/eu/europa/ec/cipa/smp/server/conversion/ServiceMetadataConverter.java
index 16bce44a3dc63680e9fb688c25388d331fceda6d..9685a286085e86669c8e9371c0077338282a3828 100644
--- a/smp-server-library/src/main/java/eu/europa/ec/cipa/smp/server/conversion/ServiceMetadataConverter.java
+++ b/smp-server-library/src/main/java/eu/europa/ec/cipa/smp/server/conversion/ServiceMetadataConverter.java
@@ -1,12 +1,10 @@
/*
* Copyright 2017 European Commission | CEF eDelivery
*
- * Licensed under the EUPL, Version 1.1 or – as soon they will be approved by the European Commission - subsequent versions of the EUPL (the "Licence");
+ * Licensed 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:
- * https://joinup.ec.europa.eu/software/page/eupl
- * or file: LICENCE-EUPL-v1.1.pdf
+ * You may obtain a copy of the Licence attached in file: LICENCE-EUPL-v1.2.pdf
*
* 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.
diff --git a/smp-server-library/src/main/java/eu/europa/ec/cipa/smp/server/hook/AbstractRegistrationHook.java b/smp-server-library/src/main/java/eu/europa/ec/cipa/smp/server/hook/AbstractRegistrationHook.java
index f5a3f745cfb2218acd0b2a4b56846d62811204bc..8a1d22f0be06503f380d1bd76eac1052aeb4cb70 100644
--- a/smp-server-library/src/main/java/eu/europa/ec/cipa/smp/server/hook/AbstractRegistrationHook.java
+++ b/smp-server-library/src/main/java/eu/europa/ec/cipa/smp/server/hook/AbstractRegistrationHook.java
@@ -1,12 +1,10 @@
/*
* Copyright 2017 European Commission | CEF eDelivery
*
- * Licensed under the EUPL, Version 1.1 or – as soon they will be approved by the European Commission - subsequent versions of the EUPL (the "Licence");
+ * Licensed 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:
- * https://joinup.ec.europa.eu/software/page/eupl
- * or file: LICENCE-EUPL-v1.1.pdf
+ * You may obtain a copy of the Licence attached in file: LICENCE-EUPL-v1.2.pdf
*
* 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.
diff --git a/smp-server-library/src/main/java/eu/europa/ec/cipa/smp/server/hook/DoNothingRegistrationHook.java b/smp-server-library/src/main/java/eu/europa/ec/cipa/smp/server/hook/DoNothingRegistrationHook.java
index 1ad0756224ba0c807ac02137b5a3c97b1b5d138e..c16df42988d61566446719b6ba0919c87dd24066 100644
--- a/smp-server-library/src/main/java/eu/europa/ec/cipa/smp/server/hook/DoNothingRegistrationHook.java
+++ b/smp-server-library/src/main/java/eu/europa/ec/cipa/smp/server/hook/DoNothingRegistrationHook.java
@@ -1,12 +1,10 @@
/*
* Copyright 2017 European Commission | CEF eDelivery
*
- * Licensed under the EUPL, Version 1.1 or – as soon they will be approved by the European Commission - subsequent versions of the EUPL (the "Licence");
+ * Licensed 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:
- * https://joinup.ec.europa.eu/software/page/eupl
- * or file: LICENCE-EUPL-v1.1.pdf
+ * You may obtain a copy of the Licence attached in file: LICENCE-EUPL-v1.2.pdf
*
* 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.
diff --git a/smp-server-library/src/main/java/eu/europa/ec/cipa/smp/server/hook/HookException.java b/smp-server-library/src/main/java/eu/europa/ec/cipa/smp/server/hook/HookException.java
index 15121993a2aa78a0161c466dcbf29fda9bc3cbbe..1c648887829252bd98ee4914a1e2e98bcf03b278 100644
--- a/smp-server-library/src/main/java/eu/europa/ec/cipa/smp/server/hook/HookException.java
+++ b/smp-server-library/src/main/java/eu/europa/ec/cipa/smp/server/hook/HookException.java
@@ -1,12 +1,10 @@
/*
* Copyright 2017 European Commission | CEF eDelivery
*
- * Licensed under the EUPL, Version 1.1 or – as soon they will be approved by the European Commission - subsequent versions of the EUPL (the "Licence");
+ * Licensed 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:
- * https://joinup.ec.europa.eu/software/page/eupl
- * or file: LICENCE-EUPL-v1.1.pdf
+ * You may obtain a copy of the Licence attached in file: LICENCE-EUPL-v1.2.pdf
*
* 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.
diff --git a/smp-server-library/src/main/java/eu/europa/ec/cipa/smp/server/hook/IRegistrationHook.java b/smp-server-library/src/main/java/eu/europa/ec/cipa/smp/server/hook/IRegistrationHook.java
index f31558da0864964b425d2a53f2239135fd370675..02045c464ad879c83e41e74867b05c43578ea0d8 100644
--- a/smp-server-library/src/main/java/eu/europa/ec/cipa/smp/server/hook/IRegistrationHook.java
+++ b/smp-server-library/src/main/java/eu/europa/ec/cipa/smp/server/hook/IRegistrationHook.java
@@ -1,12 +1,10 @@
/*
* Copyright 2017 European Commission | CEF eDelivery
*
- * Licensed under the EUPL, Version 1.1 or – as soon they will be approved by the European Commission - subsequent versions of the EUPL (the "Licence");
+ * Licensed 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:
- * https://joinup.ec.europa.eu/software/page/eupl
- * or file: LICENCE-EUPL-v1.1.pdf
+ * You may obtain a copy of the Licence attached in file: LICENCE-EUPL-v1.2.pdf
*
* 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.
diff --git a/smp-server-library/src/main/java/eu/europa/ec/cipa/smp/server/hook/PostRegistrationFilter.java b/smp-server-library/src/main/java/eu/europa/ec/cipa/smp/server/hook/PostRegistrationFilter.java
index 85b16d4aa42ac70d41445d4f3ee8fc60f095e95d..ed806dd2939445d415cdc4ee35c608b2076cd7f1 100644
--- a/smp-server-library/src/main/java/eu/europa/ec/cipa/smp/server/hook/PostRegistrationFilter.java
+++ b/smp-server-library/src/main/java/eu/europa/ec/cipa/smp/server/hook/PostRegistrationFilter.java
@@ -1,12 +1,10 @@
/*
* Copyright 2017 European Commission | CEF eDelivery
*
- * Licensed under the EUPL, Version 1.1 or – as soon they will be approved by the European Commission - subsequent versions of the EUPL (the "Licence");
+ * Licensed 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:
- * https://joinup.ec.europa.eu/software/page/eupl
- * or file: LICENCE-EUPL-v1.1.pdf
+ * You may obtain a copy of the Licence attached in file: LICENCE-EUPL-v1.2.pdf
*
* 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.
diff --git a/smp-server-library/src/main/java/eu/europa/ec/cipa/smp/server/hook/RegistrationServiceRegistrationHook.java b/smp-server-library/src/main/java/eu/europa/ec/cipa/smp/server/hook/RegistrationServiceRegistrationHook.java
index 7942b3304a3f76a1e8d3d4f099ab709b9bb54fe7..98dc0c8771c142d41ec151bb6ac6259a2d201b09 100644
--- a/smp-server-library/src/main/java/eu/europa/ec/cipa/smp/server/hook/RegistrationServiceRegistrationHook.java
+++ b/smp-server-library/src/main/java/eu/europa/ec/cipa/smp/server/hook/RegistrationServiceRegistrationHook.java
@@ -1,12 +1,10 @@
/*
* Copyright 2017 European Commission | CEF eDelivery
*
- * Licensed under the EUPL, Version 1.1 or – as soon they will be approved by the European Commission - subsequent versions of the EUPL (the "Licence");
+ * Licensed 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:
- * https://joinup.ec.europa.eu/software/page/eupl
- * or file: LICENCE-EUPL-v1.1.pdf
+ * You may obtain a copy of the Licence attached in file: LICENCE-EUPL-v1.2.pdf
*
* 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.
diff --git a/smp-server-library/src/main/java/eu/europa/ec/cipa/smp/server/hook/SMLHookConditionOff.java b/smp-server-library/src/main/java/eu/europa/ec/cipa/smp/server/hook/SMLHookConditionOff.java
index e2ab329bf3fc10cb9cf1124f8395510ba47a8709..298e5f0bd3ea59887b4472e6badcfc9d52d354d3 100644
--- a/smp-server-library/src/main/java/eu/europa/ec/cipa/smp/server/hook/SMLHookConditionOff.java
+++ b/smp-server-library/src/main/java/eu/europa/ec/cipa/smp/server/hook/SMLHookConditionOff.java
@@ -1,12 +1,10 @@
/*
* Copyright 2017 European Commission | CEF eDelivery
*
- * Licensed under the EUPL, Version 1.1 or – as soon they will be approved by the European Commission - subsequent versions of the EUPL (the "Licence");
+ * Licensed 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:
- * https://joinup.ec.europa.eu/software/page/eupl
- * or file: LICENCE-EUPL-v1.1.pdf
+ * You may obtain a copy of the Licence attached in file: LICENCE-EUPL-v1.2.pdf
*
* 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.
diff --git a/smp-server-library/src/main/java/eu/europa/ec/cipa/smp/server/hook/SMLHookConditionOn.java b/smp-server-library/src/main/java/eu/europa/ec/cipa/smp/server/hook/SMLHookConditionOn.java
index 5558f6fb6f78fa4730477d0af38374b7ac274190..19c038442f471366947ca84270074e5d6122c8e9 100644
--- a/smp-server-library/src/main/java/eu/europa/ec/cipa/smp/server/hook/SMLHookConditionOn.java
+++ b/smp-server-library/src/main/java/eu/europa/ec/cipa/smp/server/hook/SMLHookConditionOn.java
@@ -1,12 +1,10 @@
/*
* Copyright 2017 European Commission | CEF eDelivery
*
- * Licensed under the EUPL, Version 1.1 or – as soon they will be approved by the European Commission - subsequent versions of the EUPL (the "Licence");
+ * Licensed 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:
- * https://joinup.ec.europa.eu/software/page/eupl
- * or file: LICENCE-EUPL-v1.1.pdf
+ * You may obtain a copy of the Licence attached in file: LICENCE-EUPL-v1.2.pdf
*
* 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.
diff --git a/smp-server-library/src/main/java/eu/europa/ec/cipa/smp/server/security/BCryptPasswordHash.java b/smp-server-library/src/main/java/eu/europa/ec/cipa/smp/server/security/BCryptPasswordHash.java
index 9d232f5e2df5319d2f8e0895884ca426fd48f20f..202d30cdd931475a640c9e291f8f0956e48d2ba3 100644
--- a/smp-server-library/src/main/java/eu/europa/ec/cipa/smp/server/security/BCryptPasswordHash.java
+++ b/smp-server-library/src/main/java/eu/europa/ec/cipa/smp/server/security/BCryptPasswordHash.java
@@ -1,12 +1,10 @@
/*
* Copyright 2017 European Commission | CEF eDelivery
*
- * Licensed under the EUPL, Version 1.1 or – as soon they will be approved by the European Commission - subsequent versions of the EUPL (the "Licence");
+ * Licensed 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:
- * https://joinup.ec.europa.eu/software/page/eupl
- * or file: LICENCE-EUPL-v1.1.pdf
+ * You may obtain a copy of the Licence attached in file: LICENCE-EUPL-v1.2.pdf
*
* 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.
diff --git a/smp-server-library/src/main/java/eu/europa/ec/cipa/smp/server/security/CertificateDetails.java b/smp-server-library/src/main/java/eu/europa/ec/cipa/smp/server/security/CertificateDetails.java
index e0b9bcf5bd30b8dc30774afecf148b17fcf89f30..7982916fa8d1e7c73896e4bcadf60d420fdb07df 100644
--- a/smp-server-library/src/main/java/eu/europa/ec/cipa/smp/server/security/CertificateDetails.java
+++ b/smp-server-library/src/main/java/eu/europa/ec/cipa/smp/server/security/CertificateDetails.java
@@ -1,12 +1,10 @@
/*
* Copyright 2017 European Commission | CEF eDelivery
*
- * Licensed under the EUPL, Version 1.1 or – as soon they will be approved by the European Commission - subsequent versions of the EUPL (the "Licence");
+ * Licensed 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:
- * https://joinup.ec.europa.eu/software/page/eupl
- * or file: LICENCE-EUPL-v1.1.pdf
+ * You may obtain a copy of the Licence attached in file: LICENCE-EUPL-v1.2.pdf
*
* 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.
diff --git a/smp-server-library/src/main/java/eu/europa/ec/cipa/smp/server/security/DoNothingTrustManager.java b/smp-server-library/src/main/java/eu/europa/ec/cipa/smp/server/security/DoNothingTrustManager.java
index 2d64bac0eca195de0a89126f67f78bbfb025d783..0e40a500c76bd2191f1607c1e512597b052d0bcc 100644
--- a/smp-server-library/src/main/java/eu/europa/ec/cipa/smp/server/security/DoNothingTrustManager.java
+++ b/smp-server-library/src/main/java/eu/europa/ec/cipa/smp/server/security/DoNothingTrustManager.java
@@ -1,12 +1,10 @@
/*
* Copyright 2017 European Commission | CEF eDelivery
*
- * Licensed under the EUPL, Version 1.1 or – as soon they will be approved by the European Commission - subsequent versions of the EUPL (the "Licence");
+ * Licensed 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:
- * https://joinup.ec.europa.eu/software/page/eupl
- * or file: LICENCE-EUPL-v1.1.pdf
+ * You may obtain a copy of the Licence attached in file: LICENCE-EUPL-v1.2.pdf
*
* 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.
diff --git a/smp-server-library/src/main/java/eu/europa/ec/cipa/smp/server/security/HostnameVerifierAlwaysTrue.java b/smp-server-library/src/main/java/eu/europa/ec/cipa/smp/server/security/HostnameVerifierAlwaysTrue.java
index bb0d3f10330fa637e9a4d08ee95dedcf3286297b..d149d80193a0b82cb40e915e2d1d472946e91825 100644
--- a/smp-server-library/src/main/java/eu/europa/ec/cipa/smp/server/security/HostnameVerifierAlwaysTrue.java
+++ b/smp-server-library/src/main/java/eu/europa/ec/cipa/smp/server/security/HostnameVerifierAlwaysTrue.java
@@ -1,12 +1,10 @@
/*
* Copyright 2017 European Commission | CEF eDelivery
*
- * Licensed under the EUPL, Version 1.1 or – as soon they will be approved by the European Commission - subsequent versions of the EUPL (the "Licence");
+ * Licensed 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:
- * https://joinup.ec.europa.eu/software/page/eupl
- * or file: LICENCE-EUPL-v1.1.pdf
+ * You may obtain a copy of the Licence attached in file: LICENCE-EUPL-v1.2.pdf
*
* 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.
diff --git a/smp-server-library/src/main/java/eu/europa/ec/cipa/smp/server/security/KeyStoreUtils.java b/smp-server-library/src/main/java/eu/europa/ec/cipa/smp/server/security/KeyStoreUtils.java
index 7c45c1a140fadb05ac2d55d58b6cc2553cb0aa14..ec066ed7dcc6795ac4b2397b8f99a823c04f36df 100644
--- a/smp-server-library/src/main/java/eu/europa/ec/cipa/smp/server/security/KeyStoreUtils.java
+++ b/smp-server-library/src/main/java/eu/europa/ec/cipa/smp/server/security/KeyStoreUtils.java
@@ -1,12 +1,10 @@
/*
* Copyright 2017 European Commission | CEF eDelivery
*
- * Licensed under the EUPL, Version 1.1 or – as soon they will be approved by the European Commission - subsequent versions of the EUPL (the "Licence");
+ * Licensed 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:
- * https://joinup.ec.europa.eu/software/page/eupl
- * or file: LICENCE-EUPL-v1.1.pdf
+ * You may obtain a copy of the Licence attached in file: LICENCE-EUPL-v1.2.pdf
*
* 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.
diff --git a/smp-server-library/src/main/java/eu/europa/ec/cipa/smp/server/security/Signer.java b/smp-server-library/src/main/java/eu/europa/ec/cipa/smp/server/security/Signer.java
index fbdf76e31abaf7c171692dd0e8dccf13ccc73596..5ac10c7f9e48fd7b2ba7ccb04f6f727e085127b0 100644
--- a/smp-server-library/src/main/java/eu/europa/ec/cipa/smp/server/security/Signer.java
+++ b/smp-server-library/src/main/java/eu/europa/ec/cipa/smp/server/security/Signer.java
@@ -1,12 +1,10 @@
/*
* Copyright 2017 European Commission | CEF eDelivery
*
- * Licensed under the EUPL, Version 1.1 or – as soon they will be approved by the European Commission - subsequent versions of the EUPL (the "Licence");
+ * Licensed 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:
- * https://joinup.ec.europa.eu/software/page/eupl
- * or file: LICENCE-EUPL-v1.1.pdf
+ * You may obtain a copy of the Licence attached in file: LICENCE-EUPL-v1.2.pdf
*
* 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.
diff --git a/smp-server-library/src/main/java/eu/europa/ec/cipa/smp/server/util/CertificateUtils.java b/smp-server-library/src/main/java/eu/europa/ec/cipa/smp/server/util/CertificateUtils.java
index 615233f7da3bbbe40089ea265ce85f4dc4c4b33b..ae756df1f289dba21b04354f1853dc1574a296b5 100644
--- a/smp-server-library/src/main/java/eu/europa/ec/cipa/smp/server/util/CertificateUtils.java
+++ b/smp-server-library/src/main/java/eu/europa/ec/cipa/smp/server/util/CertificateUtils.java
@@ -1,12 +1,10 @@
/*
* Copyright 2017 European Commission | CEF eDelivery
*
- * Licensed under the EUPL, Version 1.1 or – as soon they will be approved by the European Commission - subsequent versions of the EUPL (the "Licence");
+ * Licensed 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:
- * https://joinup.ec.europa.eu/software/page/eupl
- * or file: LICENCE-EUPL-v1.1.pdf
+ * You may obtain a copy of the Licence attached in file: LICENCE-EUPL-v1.2.pdf
*
* 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.
diff --git a/smp-server-library/src/main/java/eu/europa/ec/cipa/smp/server/util/ExtensionUtils.java b/smp-server-library/src/main/java/eu/europa/ec/cipa/smp/server/util/ExtensionUtils.java
index ee6e8c661f4107c164789c4b60a45f9c025bac60..6059ca4a363024de9098d819ea13ca53175f0c48 100644
--- a/smp-server-library/src/main/java/eu/europa/ec/cipa/smp/server/util/ExtensionUtils.java
+++ b/smp-server-library/src/main/java/eu/europa/ec/cipa/smp/server/util/ExtensionUtils.java
@@ -1,12 +1,10 @@
/*
* Copyright 2017 European Commission | CEF eDelivery
*
- * Licensed under the EUPL, Version 1.1 or – as soon they will be approved by the European Commission - subsequent versions of the EUPL (the "Licence");
+ * Licensed 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:
- * https://joinup.ec.europa.eu/software/page/eupl
- * or file: LICENCE-EUPL-v1.1.pdf
+ * You may obtain a copy of the Licence attached in file: LICENCE-EUPL-v1.2.pdf
*
* 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.
diff --git a/smp-server-library/src/main/java/eu/europa/ec/cipa/smp/server/util/HashUtil.java b/smp-server-library/src/main/java/eu/europa/ec/cipa/smp/server/util/HashUtil.java
index dfbf825823d9601c65793c06dab0000ce94db1f4..b0854b2b193a8012a75cc51826651145a8faec99 100644
--- a/smp-server-library/src/main/java/eu/europa/ec/cipa/smp/server/util/HashUtil.java
+++ b/smp-server-library/src/main/java/eu/europa/ec/cipa/smp/server/util/HashUtil.java
@@ -1,12 +1,10 @@
/*
* Copyright 2017 European Commission | CEF eDelivery
*
- * Licensed under the EUPL, Version 1.1 or – as soon they will be approved by the European Commission - subsequent versions of the EUPL (the "Licence");
+ * Licensed 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:
- * https://joinup.ec.europa.eu/software/page/eupl
- * or file: LICENCE-EUPL-v1.1.pdf
+ * You may obtain a copy of the Licence attached in file: LICENCE-EUPL-v1.2.pdf
*
* 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.
diff --git a/smp-server-library/src/main/java/eu/europa/ec/cipa/smp/server/util/IdentifierUtils.java b/smp-server-library/src/main/java/eu/europa/ec/cipa/smp/server/util/IdentifierUtils.java
index b4a905d08c1db28f20587f58b0a4fd8bedd0b1b8..987f1049e5c82378b7c7f841d50a989230a9c9ec 100644
--- a/smp-server-library/src/main/java/eu/europa/ec/cipa/smp/server/util/IdentifierUtils.java
+++ b/smp-server-library/src/main/java/eu/europa/ec/cipa/smp/server/util/IdentifierUtils.java
@@ -1,12 +1,10 @@
/*
* Copyright 2017 European Commission | CEF eDelivery
*
- * Licensed under the EUPL, Version 1.1 or – as soon they will be approved by the European Commission - subsequent versions of the EUPL (the "Licence");
+ * Licensed 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:
- * https://joinup.ec.europa.eu/software/page/eupl
- * or file: LICENCE-EUPL-v1.1.pdf
+ * You may obtain a copy of the Licence attached in file: LICENCE-EUPL-v1.2.pdf
*
* 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.
diff --git a/smp-server-library/src/main/java/eu/europa/ec/cipa/smp/server/util/SignatureFilter.java b/smp-server-library/src/main/java/eu/europa/ec/cipa/smp/server/util/SignatureFilter.java
index 8a1a795cb4ed8cbea35c0ee1868cc460e25a2a0f..46c137662658d43cbc01631ad15551e41a4f0738 100644
--- a/smp-server-library/src/main/java/eu/europa/ec/cipa/smp/server/util/SignatureFilter.java
+++ b/smp-server-library/src/main/java/eu/europa/ec/cipa/smp/server/util/SignatureFilter.java
@@ -1,12 +1,10 @@
/*
* Copyright 2017 European Commission | CEF eDelivery
*
- * Licensed under the EUPL, Version 1.1 or – as soon they will be approved by the European Commission - subsequent versions of the EUPL (the "Licence");
+ * Licensed 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:
- * https://joinup.ec.europa.eu/software/page/eupl
- * or file: LICENCE-EUPL-v1.1.pdf
+ * You may obtain a copy of the Licence attached in file: LICENCE-EUPL-v1.2.pdf
*
* 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.
diff --git a/smp-server-library/src/main/java/eu/europa/ec/cipa/smp/server/util/to_be_removed/EChange.java b/smp-server-library/src/main/java/eu/europa/ec/cipa/smp/server/util/to_be_removed/EChange.java
index 78ace24141856313b02662ded3a2644ba335314f..ffcfcd5e2948bc9f43f19708aaa822d3a33cfeeb 100644
--- a/smp-server-library/src/main/java/eu/europa/ec/cipa/smp/server/util/to_be_removed/EChange.java
+++ b/smp-server-library/src/main/java/eu/europa/ec/cipa/smp/server/util/to_be_removed/EChange.java
@@ -1,12 +1,10 @@
/*
* Copyright 2017 European Commission | CEF eDelivery
*
- * Licensed under the EUPL, Version 1.1 or – as soon they will be approved by the European Commission - subsequent versions of the EUPL (the "Licence");
+ * Licensed 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:
- * https://joinup.ec.europa.eu/software/page/eupl
- * or file: LICENCE-EUPL-v1.1.pdf
+ * You may obtain a copy of the Licence attached in file: LICENCE-EUPL-v1.2.pdf
*
* 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.
diff --git a/smp-server-library/src/main/java/eu/europa/ec/cipa/smp/server/util/to_be_removed/ESuccess.java b/smp-server-library/src/main/java/eu/europa/ec/cipa/smp/server/util/to_be_removed/ESuccess.java
index 0a9d4855a6bd1f33299c426b6be33c7269e6da4d..56d636bc74068edf7343a3bd12413e0f62430138 100644
--- a/smp-server-library/src/main/java/eu/europa/ec/cipa/smp/server/util/to_be_removed/ESuccess.java
+++ b/smp-server-library/src/main/java/eu/europa/ec/cipa/smp/server/util/to_be_removed/ESuccess.java
@@ -1,27 +1,10 @@
/*
* Copyright 2017 European Commission | CEF eDelivery
*
- * Licensed under the EUPL, Version 1.1 or – as soon they will be approved by the European Commission - subsequent versions of the EUPL (the "Licence");
+ * Licensed 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:
- * https://joinup.ec.europa.eu/software/page/eupl
- * or file: LICENCE-EUPL-v1.1.pdf
- *
- * 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.
- */
-
-/*
- * Copyright 2017 European Commission | CEF eDelivery
- *
- * Licensed under the EUPL, Version 1.1 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:
- * https://joinup.ec.europa.eu/software/page/eupl
- * or file: LICENCE-EUPL-v1.1.pdf
+ * You may obtain a copy of the Licence attached in file: LICENCE-EUPL-v1.2.pdf
*
* 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.
diff --git a/smp-server-library/src/main/java/eu/europa/ec/cipa/smp/server/util/to_be_removed/VerySecureRandom.java b/smp-server-library/src/main/java/eu/europa/ec/cipa/smp/server/util/to_be_removed/VerySecureRandom.java
index 698c6af1bca7f85e20822c79fe116d08d7278188..84dedbe21ceb45b394ead98618d37ba6e9d51700 100644
--- a/smp-server-library/src/main/java/eu/europa/ec/cipa/smp/server/util/to_be_removed/VerySecureRandom.java
+++ b/smp-server-library/src/main/java/eu/europa/ec/cipa/smp/server/util/to_be_removed/VerySecureRandom.java
@@ -1,12 +1,10 @@
/*
* Copyright 2017 European Commission | CEF eDelivery
*
- * Licensed under the EUPL, Version 1.1 or – as soon they will be approved by the European Commission - subsequent versions of the EUPL (the "Licence");
+ * Licensed 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:
- * https://joinup.ec.europa.eu/software/page/eupl
- * or file: LICENCE-EUPL-v1.1.pdf
+ * You may obtain a copy of the Licence attached in file: LICENCE-EUPL-v1.2.pdf
*
* 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.
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 e0faa253d70df1f9890695832f9555a913945b53..4b2f2904a96a2e607659b91373da53e8f1bd810c 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
@@ -1,12 +1,10 @@
/*
* Copyright 2017 European Commission | CEF eDelivery
*
- * Licensed under the EUPL, Version 1.1 or – as soon they will be approved by the European Commission - subsequent versions of the EUPL (the "Licence");
+ * Licensed 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:
- * https://joinup.ec.europa.eu/software/page/eupl
- * or file: LICENCE-EUPL-v1.1.pdf
+ * You may obtain a copy of the Licence attached in file: LICENCE-EUPL-v1.2.pdf
*
* 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.
diff --git a/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/data/dao/OwnershipDao.java b/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/data/dao/OwnershipDao.java
index 2a4ac0b9adba90422c8e6a49d90b2f7a5b617ebb..47ffc88dc80978cb98649cd7d790c474bae737ad 100644
--- a/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/data/dao/OwnershipDao.java
+++ b/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/data/dao/OwnershipDao.java
@@ -1,12 +1,10 @@
/*
* Copyright 2017 European Commission | CEF eDelivery
*
- * Licensed under the EUPL, Version 1.1 or – as soon they will be approved by the European Commission - subsequent versions of the EUPL (the "Licence");
+ * Licensed 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:
- * https://joinup.ec.europa.eu/software/page/eupl
- * or file: LICENCE-EUPL-v1.1.pdf
+ * You may obtain a copy of the Licence attached in file: LICENCE-EUPL-v1.2.pdf
*
* 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.
diff --git a/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/data/dao/ServiceGroupDao.java b/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/data/dao/ServiceGroupDao.java
index 36ab5d1cfdad1b45e82871c6ed4f4cf95a0bdd7b..2e963d2cd4c8caa0219ea05a42a79767557707db 100644
--- a/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/data/dao/ServiceGroupDao.java
+++ b/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/data/dao/ServiceGroupDao.java
@@ -1,12 +1,10 @@
/*
* Copyright 2017 European Commission | CEF eDelivery
*
- * Licensed under the EUPL, Version 1.1 or – as soon they will be approved by the European Commission - subsequent versions of the EUPL (the "Licence");
+ * Licensed 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:
- * https://joinup.ec.europa.eu/software/page/eupl
- * or file: LICENCE-EUPL-v1.1.pdf
+ * You may obtain a copy of the Licence attached in file: LICENCE-EUPL-v1.2.pdf
*
* 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.
diff --git a/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/data/dao/ServiceMetadataDao.java b/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/data/dao/ServiceMetadataDao.java
index d6a27dcb41b3aa0a2d198381afc864cf0545e966..614dad7aa0b84c79dc3f5c11428743e3d1865c08 100644
--- a/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/data/dao/ServiceMetadataDao.java
+++ b/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/data/dao/ServiceMetadataDao.java
@@ -1,12 +1,10 @@
/*
* Copyright 2017 European Commission | CEF eDelivery
*
- * Licensed under the EUPL, Version 1.1 or – as soon they will be approved by the European Commission - subsequent versions of the EUPL (the "Licence");
+ * Licensed 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:
- * https://joinup.ec.europa.eu/software/page/eupl
- * or file: LICENCE-EUPL-v1.1.pdf
+ * You may obtain a copy of the Licence attached in file: LICENCE-EUPL-v1.2.pdf
*
* 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.
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 9ec88083b881be9be4c6755518cbdd896b67e513..dd812e253f9b019320828221e5d3a27025e614bb 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
@@ -1,12 +1,10 @@
/*
* Copyright 2017 European Commission | CEF eDelivery
*
- * Licensed under the EUPL, Version 1.1 or – as soon they will be approved by the European Commission - subsequent versions of the EUPL (the "Licence");
+ * Licensed 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:
- * https://joinup.ec.europa.eu/software/page/eupl
- * or file: LICENCE-EUPL-v1.1.pdf
+ * You may obtain a copy of the Licence attached in file: LICENCE-EUPL-v1.2.pdf
*
* 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.
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 fbec59238109a45955a8d3da004a6559a274dc48..675e623a248674c951aab844de55e419bf8a16a7 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
@@ -1,12 +1,10 @@
/*
* Copyright 2017 European Commission | CEF eDelivery
*
- * Licensed under the EUPL, Version 1.1 or – as soon they will be approved by the European Commission - subsequent versions of the EUPL (the "Licence");
+ * Licensed 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:
- * https://joinup.ec.europa.eu/software/page/eupl
- * or file: LICENCE-EUPL-v1.1.pdf
+ * You may obtain a copy of the Licence attached in file: LICENCE-EUPL-v1.2.pdf
*
* 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.
diff --git a/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/data/model/DBOwnership.java b/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/data/model/DBOwnership.java
index b39a5dd20e87c3572ecc3409708c09c5ebd09401..92a40ca9763dac9d21a6eea35bf7da2bc6edf3ab 100644
--- a/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/data/model/DBOwnership.java
+++ b/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/data/model/DBOwnership.java
@@ -1,12 +1,10 @@
/*
* Copyright 2017 European Commission | CEF eDelivery
*
- * Licensed under the EUPL, Version 1.1 or – as soon they will be approved by the European Commission - subsequent versions of the EUPL (the "Licence");
+ * Licensed 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:
- * https://joinup.ec.europa.eu/software/page/eupl
- * or file: LICENCE-EUPL-v1.1.pdf
+ * You may obtain a copy of the Licence attached in file: LICENCE-EUPL-v1.2.pdf
*
* 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.
diff --git a/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/data/model/DBOwnershipId.java b/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/data/model/DBOwnershipId.java
index a6bc958ce389f63de7bc7e27c4e303b08907cc0f..76c0513ea1baea7301f321c0667eb5fda74e9609 100644
--- a/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/data/model/DBOwnershipId.java
+++ b/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/data/model/DBOwnershipId.java
@@ -1,12 +1,10 @@
/*
* Copyright 2017 European Commission | CEF eDelivery
*
- * Licensed under the EUPL, Version 1.1 or – as soon they will be approved by the European Commission - subsequent versions of the EUPL (the "Licence");
+ * Licensed 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:
- * https://joinup.ec.europa.eu/software/page/eupl
- * or file: LICENCE-EUPL-v1.1.pdf
+ * You may obtain a copy of the Licence attached in file: LICENCE-EUPL-v1.2.pdf
*
* 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.
diff --git a/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/data/model/DBServiceGroup.java b/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/data/model/DBServiceGroup.java
index ea564e9f849b77cfecd917ac546b20f720fc52f9..a564d67cb3b7119f511e18cc5a6f910d34d892e3 100644
--- a/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/data/model/DBServiceGroup.java
+++ b/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/data/model/DBServiceGroup.java
@@ -1,12 +1,10 @@
/*
* Copyright 2017 European Commission | CEF eDelivery
*
- * Licensed under the EUPL, Version 1.1 or – as soon they will be approved by the European Commission - subsequent versions of the EUPL (the "Licence");
+ * Licensed 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:
- * https://joinup.ec.europa.eu/software/page/eupl
- * or file: LICENCE-EUPL-v1.1.pdf
+ * You may obtain a copy of the Licence attached in file: LICENCE-EUPL-v1.2.pdf
*
* 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.
diff --git a/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/data/model/DBServiceGroupId.java b/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/data/model/DBServiceGroupId.java
index 1a1767d21504ba121ed446bc87c456d5bb5645a5..5016f5f2033456792a363a3445d860b5279bb4eb 100644
--- a/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/data/model/DBServiceGroupId.java
+++ b/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/data/model/DBServiceGroupId.java
@@ -1,12 +1,10 @@
/*
* Copyright 2017 European Commission | CEF eDelivery
*
- * Licensed under the EUPL, Version 1.1 or – as soon they will be approved by the European Commission - subsequent versions of the EUPL (the "Licence");
+ * Licensed 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:
- * https://joinup.ec.europa.eu/software/page/eupl
- * or file: LICENCE-EUPL-v1.1.pdf
+ * You may obtain a copy of the Licence attached in file: LICENCE-EUPL-v1.2.pdf
*
* 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.
diff --git a/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/data/model/DBServiceMetadata.java b/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/data/model/DBServiceMetadata.java
index aa40efe49fbc9adde8d655e6af33df0b3752e709..9d44cef069fc833951b2ff578f89374b93acabf1 100644
--- a/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/data/model/DBServiceMetadata.java
+++ b/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/data/model/DBServiceMetadata.java
@@ -1,12 +1,10 @@
/*
* Copyright 2017 European Commission | CEF eDelivery
*
- * Licensed under the EUPL, Version 1.1 or – as soon they will be approved by the European Commission - subsequent versions of the EUPL (the "Licence");
+ * Licensed 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:
- * https://joinup.ec.europa.eu/software/page/eupl
- * or file: LICENCE-EUPL-v1.1.pdf
+ * You may obtain a copy of the Licence attached in file: LICENCE-EUPL-v1.2.pdf
*
* 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.
diff --git a/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/data/model/DBServiceMetadataId.java b/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/data/model/DBServiceMetadataId.java
index 83be66e289d72ade3299969257287417fd033b6a..403e87780b37d489f4db2b9f07bb4d632062e223 100644
--- a/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/data/model/DBServiceMetadataId.java
+++ b/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/data/model/DBServiceMetadataId.java
@@ -1,12 +1,10 @@
/*
* Copyright 2017 European Commission | CEF eDelivery
*
- * Licensed under the EUPL, Version 1.1 or – as soon they will be approved by the European Commission - subsequent versions of the EUPL (the "Licence");
+ * Licensed 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:
- * https://joinup.ec.europa.eu/software/page/eupl
- * or file: LICENCE-EUPL-v1.1.pdf
+ * You may obtain a copy of the Licence attached in file: LICENCE-EUPL-v1.2.pdf
*
* 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.
diff --git a/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/data/model/DBUser.java b/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/data/model/DBUser.java
index fe5c3ae79d61dd3a68109b0ee6c5b2f94f2a14eb..bcd907e35d946cede60a655f9961edf0b5778d7c 100644
--- a/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/data/model/DBUser.java
+++ b/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/data/model/DBUser.java
@@ -1,12 +1,10 @@
/*
* Copyright 2017 European Commission | CEF eDelivery
*
- * Licensed under the EUPL, Version 1.1 or – as soon they will be approved by the European Commission - subsequent versions of the EUPL (the "Licence");
+ * Licensed 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:
- * https://joinup.ec.europa.eu/software/page/eupl
- * or file: LICENCE-EUPL-v1.1.pdf
+ * You may obtain a copy of the Licence attached in file: LICENCE-EUPL-v1.2.pdf
*
* 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.
diff --git a/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/exceptions/CertificateAuthenticationException.java b/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/exceptions/CertificateAuthenticationException.java
index 29d47705bbb7a6f8db8dd7b4a955b9d6257f2db6..9f8dacd463321d7a3cecc165f27c438ff942dc65 100644
--- a/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/exceptions/CertificateAuthenticationException.java
+++ b/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/exceptions/CertificateAuthenticationException.java
@@ -1,12 +1,10 @@
/*
* Copyright 2017 European Commission | CEF eDelivery
*
- * Licensed under the EUPL, Version 1.1 or – as soon they will be approved by the European Commission - subsequent versions of the EUPL (the "Licence");
+ * Licensed 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:
- * https://joinup.ec.europa.eu/software/page/eupl
- * or file: LICENCE-EUPL-v1.1.pdf
+ * You may obtain a copy of the Licence attached in file: LICENCE-EUPL-v1.2.pdf
*
* 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.
diff --git a/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/exceptions/ConversionException.java b/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/exceptions/ConversionException.java
index 03b6aa9444945a087f3fe17e566139bca3ff3d40..fade5ea8ce47690f276cd0ce7aa4fc3f28efcffb 100644
--- a/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/exceptions/ConversionException.java
+++ b/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/exceptions/ConversionException.java
@@ -1,12 +1,10 @@
/*
* Copyright 2017 European Commission | CEF eDelivery
*
- * Licensed under the EUPL, Version 1.1 or – as soon they will be approved by the European Commission - subsequent versions of the EUPL (the "Licence");
+ * Licensed 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:
- * https://joinup.ec.europa.eu/software/page/eupl
- * or file: LICENCE-EUPL-v1.1.pdf
+ * You may obtain a copy of the Licence attached in file: LICENCE-EUPL-v1.2.pdf
*
* 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.
diff --git a/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/exceptions/NotFoundException.java b/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/exceptions/NotFoundException.java
index 26236ec4e5e80344d3db947a8e50ecefecf264da..96292de3cc541c2d6d7edd794ef99594275b934d 100644
--- a/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/exceptions/NotFoundException.java
+++ b/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/exceptions/NotFoundException.java
@@ -1,12 +1,10 @@
/*
* Copyright 2017 European Commission | CEF eDelivery
*
- * Licensed under the EUPL, Version 1.1 or – as soon they will be approved by the European Commission - subsequent versions of the EUPL (the "Licence");
+ * Licensed 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:
- * https://joinup.ec.europa.eu/software/page/eupl
- * or file: LICENCE-EUPL-v1.1.pdf
+ * You may obtain a copy of the Licence attached in file: LICENCE-EUPL-v1.2.pdf
*
* 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.
diff --git a/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/exceptions/UnknownUserException.java b/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/exceptions/UnknownUserException.java
index 6a04c6789263a3da1e8f3f61ed169651e89e855f..182c20cdca69910433845bf0362b4573374fed9d 100644
--- a/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/exceptions/UnknownUserException.java
+++ b/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/exceptions/UnknownUserException.java
@@ -1,12 +1,10 @@
/*
* Copyright 2017 European Commission | CEF eDelivery
*
- * Licensed under the EUPL, Version 1.1 or – as soon they will be approved by the European Commission - subsequent versions of the EUPL (the "Licence");
+ * Licensed 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:
- * https://joinup.ec.europa.eu/software/page/eupl
- * or file: LICENCE-EUPL-v1.1.pdf
+ * You may obtain a copy of the Licence attached in file: LICENCE-EUPL-v1.2.pdf
*
* 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.
diff --git a/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/exceptions/XmlParsingException.java b/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/exceptions/XmlParsingException.java
index b8ed6d76ee694e9432e7851bee07492dce5793ad..186d41319220271b59b53f87f9c5d7b68658e301 100644
--- a/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/exceptions/XmlParsingException.java
+++ b/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/exceptions/XmlParsingException.java
@@ -1,12 +1,10 @@
/*
* Copyright 2017 European Commission | CEF eDelivery
*
- * Licensed under the EUPL, Version 1.1 or – as soon they will be approved by the European Commission - subsequent versions of the EUPL (the "Licence");
+ * Licensed 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:
- * https://joinup.ec.europa.eu/software/page/eupl
- * or file: LICENCE-EUPL-v1.1.pdf
+ * You may obtain a copy of the Licence attached in file: LICENCE-EUPL-v1.2.pdf
*
* 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.
diff --git a/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/services/ServiceGroupService.java b/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/services/ServiceGroupService.java
index 6ad61bf294a9f75fd1af9034f0ea3cc89673c8f9..a91506a9f662f4da3c90ca93f01e510d1dd7e56e 100644
--- a/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/services/ServiceGroupService.java
+++ b/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/services/ServiceGroupService.java
@@ -1,12 +1,10 @@
/*
* Copyright 2017 European Commission | CEF eDelivery
*
- * Licensed under the EUPL, Version 1.1 or – as soon they will be approved by the European Commission - subsequent versions of the EUPL (the "Licence");
+ * Licensed 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:
- * https://joinup.ec.europa.eu/software/page/eupl
- * or file: LICENCE-EUPL-v1.1.pdf
+ * You may obtain a copy of the Licence attached in file: LICENCE-EUPL-v1.2.pdf
*
* 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.
diff --git a/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/services/ServiceMetadataService.java b/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/services/ServiceMetadataService.java
index 971a7b811e09004c25fa23b9444dce9e31b293bc..1b1bb64cf98abf6cc7f993e43ae1a5bae0d41222 100644
--- a/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/services/ServiceMetadataService.java
+++ b/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/services/ServiceMetadataService.java
@@ -1,12 +1,10 @@
/*
* Copyright 2017 European Commission | CEF eDelivery
*
- * Licensed under the EUPL, Version 1.1 or – as soon they will be approved by the European Commission - subsequent versions of the EUPL (the "Licence");
+ * Licensed 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:
- * https://joinup.ec.europa.eu/software/page/eupl
- * or file: LICENCE-EUPL-v1.1.pdf
+ * You may obtain a copy of the Licence attached in file: LICENCE-EUPL-v1.2.pdf
*
* 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.
diff --git a/smp-server-library/src/test/java/eu/europa/ec/cipa/smp/server/conversion/CaseSensitivityNormalizerTest.java b/smp-server-library/src/test/java/eu/europa/ec/cipa/smp/server/conversion/CaseSensitivityNormalizerTest.java
index 2935a1887358f36a2de9d0691e7e6f3e1b8ed2e4..17d750e0b431d0fc37f795a311bab5196bc3c6fa 100644
--- a/smp-server-library/src/test/java/eu/europa/ec/cipa/smp/server/conversion/CaseSensitivityNormalizerTest.java
+++ b/smp-server-library/src/test/java/eu/europa/ec/cipa/smp/server/conversion/CaseSensitivityNormalizerTest.java
@@ -1,12 +1,10 @@
/*
* Copyright 2017 European Commission | CEF eDelivery
*
- * Licensed under the EUPL, Version 1.1 or – as soon they will be approved by the European Commission - subsequent versions of the EUPL (the "Licence");
+ * Licensed 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:
- * https://joinup.ec.europa.eu/software/page/eupl
- * or file: LICENCE-EUPL-v1.1.pdf
+ * You may obtain a copy of the Licence attached in file: LICENCE-EUPL-v1.2.pdf
*
* 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.
diff --git a/smp-server-library/src/test/java/eu/europa/ec/cipa/smp/server/conversion/ServiceGroupConverterTest.java b/smp-server-library/src/test/java/eu/europa/ec/cipa/smp/server/conversion/ServiceGroupConverterTest.java
index d3424d4882a5aad2906c515d8f1b49d114e1fc43..f2019cceca7b42f3a3b82764e99ffaefc40798b0 100644
--- a/smp-server-library/src/test/java/eu/europa/ec/cipa/smp/server/conversion/ServiceGroupConverterTest.java
+++ b/smp-server-library/src/test/java/eu/europa/ec/cipa/smp/server/conversion/ServiceGroupConverterTest.java
@@ -1,12 +1,10 @@
/*
* Copyright 2017 European Commission | CEF eDelivery
*
- * Licensed under the EUPL, Version 1.1 or – as soon they will be approved by the European Commission - subsequent versions of the EUPL (the "Licence");
+ * Licensed 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:
- * https://joinup.ec.europa.eu/software/page/eupl
- * or file: LICENCE-EUPL-v1.1.pdf
+ * You may obtain a copy of the Licence attached in file: LICENCE-EUPL-v1.2.pdf
*
* 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.
diff --git a/smp-server-library/src/test/java/eu/europa/ec/cipa/smp/server/conversion/ServiceMetadataConverterTest.java b/smp-server-library/src/test/java/eu/europa/ec/cipa/smp/server/conversion/ServiceMetadataConverterTest.java
index dba89bafdbe9a0d8e5217dd1cb30cdc7055c3154..d7896fe6eab090f222dcbaad5b15044e7224e003 100644
--- a/smp-server-library/src/test/java/eu/europa/ec/cipa/smp/server/conversion/ServiceMetadataConverterTest.java
+++ b/smp-server-library/src/test/java/eu/europa/ec/cipa/smp/server/conversion/ServiceMetadataConverterTest.java
@@ -1,12 +1,10 @@
/*
* Copyright 2017 European Commission | CEF eDelivery
*
- * Licensed under the EUPL, Version 1.1 or – as soon they will be approved by the European Commission - subsequent versions of the EUPL (the "Licence");
+ * Licensed 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:
- * https://joinup.ec.europa.eu/software/page/eupl
- * or file: LICENCE-EUPL-v1.1.pdf
+ * You may obtain a copy of the Licence attached in file: LICENCE-EUPL-v1.2.pdf
*
* 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.
diff --git a/smp-server-library/src/test/java/eu/europa/ec/cipa/smp/server/hook/RegistrationServiceRegistrationHookTest.java b/smp-server-library/src/test/java/eu/europa/ec/cipa/smp/server/hook/RegistrationServiceRegistrationHookTest.java
index 5bae4364eb60224276fad7f452213b2dacae8ab6..d44a8f0256b76785bebbebe4ea851a39cbbe7075 100644
--- a/smp-server-library/src/test/java/eu/europa/ec/cipa/smp/server/hook/RegistrationServiceRegistrationHookTest.java
+++ b/smp-server-library/src/test/java/eu/europa/ec/cipa/smp/server/hook/RegistrationServiceRegistrationHookTest.java
@@ -1,12 +1,10 @@
/*
* Copyright 2017 European Commission | CEF eDelivery
*
- * Licensed under the EUPL, Version 1.1 or – as soon they will be approved by the European Commission - subsequent versions of the EUPL (the "Licence");
+ * Licensed 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:
- * https://joinup.ec.europa.eu/software/page/eupl
- * or file: LICENCE-EUPL-v1.1.pdf
+ * You may obtain a copy of the Licence attached in file: LICENCE-EUPL-v1.2.pdf
*
* 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.
diff --git a/smp-server-library/src/test/java/eu/europa/ec/cipa/smp/server/security/BCryptPasswordHashTest.java b/smp-server-library/src/test/java/eu/europa/ec/cipa/smp/server/security/BCryptPasswordHashTest.java
index 2deb93aad180324482faf4befeb9746340740a26..45bbe4d34da13250a8f1e34ab9a458997fac1163 100644
--- a/smp-server-library/src/test/java/eu/europa/ec/cipa/smp/server/security/BCryptPasswordHashTest.java
+++ b/smp-server-library/src/test/java/eu/europa/ec/cipa/smp/server/security/BCryptPasswordHashTest.java
@@ -1,12 +1,10 @@
/*
* Copyright 2017 European Commission | CEF eDelivery
*
- * Licensed under the EUPL, Version 1.1 or – as soon they will be approved by the European Commission - subsequent versions of the EUPL (the "Licence");
+ * Licensed 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:
- * https://joinup.ec.europa.eu/software/page/eupl
- * or file: LICENCE-EUPL-v1.1.pdf
+ * You may obtain a copy of the Licence attached in file: LICENCE-EUPL-v1.2.pdf
*
* 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.
diff --git a/smp-server-library/src/test/java/eu/europa/ec/cipa/smp/server/security/DoNothingTrustManagerTest.java b/smp-server-library/src/test/java/eu/europa/ec/cipa/smp/server/security/DoNothingTrustManagerTest.java
index b43fde93e2897eb7a6a73ffdaa4ed907241cb54d..4d90d0e942efb938db201944e202fba3e546c729 100644
--- a/smp-server-library/src/test/java/eu/europa/ec/cipa/smp/server/security/DoNothingTrustManagerTest.java
+++ b/smp-server-library/src/test/java/eu/europa/ec/cipa/smp/server/security/DoNothingTrustManagerTest.java
@@ -1,12 +1,10 @@
/*
* Copyright 2017 European Commission | CEF eDelivery
*
- * Licensed under the EUPL, Version 1.1 or – as soon they will be approved by the European Commission - subsequent versions of the EUPL (the "Licence");
+ * Licensed 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:
- * https://joinup.ec.europa.eu/software/page/eupl
- * or file: LICENCE-EUPL-v1.1.pdf
+ * You may obtain a copy of the Licence attached in file: LICENCE-EUPL-v1.2.pdf
*
* 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.
diff --git a/smp-server-library/src/test/java/eu/europa/ec/cipa/smp/server/security/HostnameVerifierAlwaysTrueTest.java b/smp-server-library/src/test/java/eu/europa/ec/cipa/smp/server/security/HostnameVerifierAlwaysTrueTest.java
index 179625688c1f21798d5846f9325a04aef40a2c27..00bc4b7ca7b301c31aaf5d1b2f2fb9c775b260f6 100644
--- a/smp-server-library/src/test/java/eu/europa/ec/cipa/smp/server/security/HostnameVerifierAlwaysTrueTest.java
+++ b/smp-server-library/src/test/java/eu/europa/ec/cipa/smp/server/security/HostnameVerifierAlwaysTrueTest.java
@@ -1,12 +1,10 @@
/*
* Copyright 2017 European Commission | CEF eDelivery
*
- * Licensed under the EUPL, Version 1.1 or – as soon they will be approved by the European Commission - subsequent versions of the EUPL (the "Licence");
+ * Licensed 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:
- * https://joinup.ec.europa.eu/software/page/eupl
- * or file: LICENCE-EUPL-v1.1.pdf
+ * You may obtain a copy of the Licence attached in file: LICENCE-EUPL-v1.2.pdf
*
* 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.
diff --git a/smp-server-library/src/test/java/eu/europa/ec/cipa/smp/server/security/SignatureUtil.java b/smp-server-library/src/test/java/eu/europa/ec/cipa/smp/server/security/SignatureUtil.java
index f0d5735fabc6fd9e6a9a8b48e1c6dfa0bfb6a947..4b2cb60e3fed3ea82c39717b7866847230f8de0d 100644
--- a/smp-server-library/src/test/java/eu/europa/ec/cipa/smp/server/security/SignatureUtil.java
+++ b/smp-server-library/src/test/java/eu/europa/ec/cipa/smp/server/security/SignatureUtil.java
@@ -1,12 +1,10 @@
/*
* Copyright 2017 European Commission | CEF eDelivery
*
- * Licensed under the EUPL, Version 1.1 or – as soon they will be approved by the European Commission - subsequent versions of the EUPL (the "Licence");
+ * Licensed 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:
- * https://joinup.ec.europa.eu/software/page/eupl
- * or file: LICENCE-EUPL-v1.1.pdf
+ * You may obtain a copy of the Licence attached in file: LICENCE-EUPL-v1.2.pdf
*
* 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.
diff --git a/smp-server-library/src/test/java/eu/europa/ec/cipa/smp/server/security/SignerTest.java b/smp-server-library/src/test/java/eu/europa/ec/cipa/smp/server/security/SignerTest.java
index bdefd463e2d66586691de7aa1eee1224767fc10f..8e15d06e2526f8a2a47d4554ef74aa76ff7741fc 100644
--- a/smp-server-library/src/test/java/eu/europa/ec/cipa/smp/server/security/SignerTest.java
+++ b/smp-server-library/src/test/java/eu/europa/ec/cipa/smp/server/security/SignerTest.java
@@ -1,12 +1,10 @@
/*
* Copyright 2017 European Commission | CEF eDelivery
*
- * Licensed under the EUPL, Version 1.1 or – as soon they will be approved by the European Commission - subsequent versions of the EUPL (the "Licence");
+ * Licensed 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:
- * https://joinup.ec.europa.eu/software/page/eupl
- * or file: LICENCE-EUPL-v1.1.pdf
+ * You may obtain a copy of the Licence attached in file: LICENCE-EUPL-v1.2.pdf
*
* 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.
diff --git a/smp-server-library/src/test/java/eu/europa/ec/cipa/smp/server/security/X509KeySelector.java b/smp-server-library/src/test/java/eu/europa/ec/cipa/smp/server/security/X509KeySelector.java
index 742f6e8f380fd6b8f727c568872b91c316c9e81a..8965ee6bbcff510a1a824c250e0254955d6de786 100644
--- a/smp-server-library/src/test/java/eu/europa/ec/cipa/smp/server/security/X509KeySelector.java
+++ b/smp-server-library/src/test/java/eu/europa/ec/cipa/smp/server/security/X509KeySelector.java
@@ -1,12 +1,10 @@
/*
* Copyright 2017 European Commission | CEF eDelivery
*
- * Licensed under the EUPL, Version 1.1 or – as soon they will be approved by the European Commission - subsequent versions of the EUPL (the "Licence");
+ * Licensed 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:
- * https://joinup.ec.europa.eu/software/page/eupl
- * or file: LICENCE-EUPL-v1.1.pdf
+ * You may obtain a copy of the Licence attached in file: LICENCE-EUPL-v1.2.pdf
*
* 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.
diff --git a/smp-server-library/src/test/java/eu/europa/ec/cipa/smp/server/util/CertificateUtilsTest.java b/smp-server-library/src/test/java/eu/europa/ec/cipa/smp/server/util/CertificateUtilsTest.java
index fd68457f6107f20fedaa8a861c652318fedfa419..231903aca6ca39fc6b2e1af84a71773f0fa3cfad 100644
--- a/smp-server-library/src/test/java/eu/europa/ec/cipa/smp/server/util/CertificateUtilsTest.java
+++ b/smp-server-library/src/test/java/eu/europa/ec/cipa/smp/server/util/CertificateUtilsTest.java
@@ -1,12 +1,10 @@
/*
* Copyright 2017 European Commission | CEF eDelivery
*
- * Licensed under the EUPL, Version 1.1 or – as soon they will be approved by the European Commission - subsequent versions of the EUPL (the "Licence");
+ * Licensed 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:
- * https://joinup.ec.europa.eu/software/page/eupl
- * or file: LICENCE-EUPL-v1.1.pdf
+ * You may obtain a copy of the Licence attached in file: LICENCE-EUPL-v1.2.pdf
*
* 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.
diff --git a/smp-server-library/src/test/java/eu/europa/ec/cipa/smp/server/util/CommonUtil.java b/smp-server-library/src/test/java/eu/europa/ec/cipa/smp/server/util/CommonUtil.java
index 68f3fdf725fd233803cae086b6cf078f811cc2e0..0924da1dc332f3b331f650e976cc38469280e73d 100644
--- a/smp-server-library/src/test/java/eu/europa/ec/cipa/smp/server/util/CommonUtil.java
+++ b/smp-server-library/src/test/java/eu/europa/ec/cipa/smp/server/util/CommonUtil.java
@@ -1,12 +1,10 @@
/*
* Copyright 2017 European Commission | CEF eDelivery
*
- * Licensed under the EUPL, Version 1.1 or – as soon they will be approved by the European Commission - subsequent versions of the EUPL (the "Licence");
+ * Licensed 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:
- * https://joinup.ec.europa.eu/software/page/eupl
- * or file: LICENCE-EUPL-v1.1.pdf
+ * You may obtain a copy of the Licence attached in file: LICENCE-EUPL-v1.2.pdf
*
* 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.
diff --git a/smp-server-library/src/test/java/eu/europa/ec/cipa/smp/server/util/DefaultHttpHeader.java b/smp-server-library/src/test/java/eu/europa/ec/cipa/smp/server/util/DefaultHttpHeader.java
index d2687fad3cd353c223cf973ce0f423ae4ce6cfd7..3d024f4a1d62140f1326ee0e0351646720625f9b 100644
--- a/smp-server-library/src/test/java/eu/europa/ec/cipa/smp/server/util/DefaultHttpHeader.java
+++ b/smp-server-library/src/test/java/eu/europa/ec/cipa/smp/server/util/DefaultHttpHeader.java
@@ -1,12 +1,10 @@
/*
* Copyright 2017 European Commission | CEF eDelivery
*
- * Licensed under the EUPL, Version 1.1 or – as soon they will be approved by the European Commission - subsequent versions of the EUPL (the "Licence");
+ * Licensed 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:
- * https://joinup.ec.europa.eu/software/page/eupl
- * or file: LICENCE-EUPL-v1.1.pdf
+ * You may obtain a copy of the Licence attached in file: LICENCE-EUPL-v1.2.pdf
*
* 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.
diff --git a/smp-server-library/src/test/java/eu/europa/ec/cipa/smp/server/util/ExtensionUtilsTest.java b/smp-server-library/src/test/java/eu/europa/ec/cipa/smp/server/util/ExtensionUtilsTest.java
index 65ea94faa0c91c36ce96e56ed974f28d663ec4a3..879eeb1d2024622eb344d8b67f39e31b25c239a2 100644
--- a/smp-server-library/src/test/java/eu/europa/ec/cipa/smp/server/util/ExtensionUtilsTest.java
+++ b/smp-server-library/src/test/java/eu/europa/ec/cipa/smp/server/util/ExtensionUtilsTest.java
@@ -1,12 +1,10 @@
/*
* Copyright 2017 European Commission | CEF eDelivery
*
- * Licensed under the EUPL, Version 1.1 or – as soon they will be approved by the European Commission - subsequent versions of the EUPL (the "Licence");
+ * Licensed 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:
- * https://joinup.ec.europa.eu/software/page/eupl
- * or file: LICENCE-EUPL-v1.1.pdf
+ * You may obtain a copy of the Licence attached in file: LICENCE-EUPL-v1.2.pdf
*
* 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.
diff --git a/smp-server-library/src/test/java/eu/europa/ec/cipa/smp/server/util/HashUtilTest.java b/smp-server-library/src/test/java/eu/europa/ec/cipa/smp/server/util/HashUtilTest.java
index 83dede58971e0a13836338e45598e94308a67c24..d6d51ff9f88a6d718b54c72ea2801d9d87a826ac 100644
--- a/smp-server-library/src/test/java/eu/europa/ec/cipa/smp/server/util/HashUtilTest.java
+++ b/smp-server-library/src/test/java/eu/europa/ec/cipa/smp/server/util/HashUtilTest.java
@@ -1,39 +1,16 @@
/*
* Copyright 2017 European Commission | CEF eDelivery
*
- * Licensed under the EUPL, Version 1.1 or – as soon they will be approved by the European Commission - subsequent versions of the EUPL (the "Licence");
+ * Licensed 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:
- * https://joinup.ec.europa.eu/software/page/eupl
- * or file: LICENCE-EUPL-v1.1.pdf
+ * You may obtain a copy of the Licence attached in file: LICENCE-EUPL-v1.2.pdf
*
* 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.
*/
-/*
- * (C) Copyright 2016 - European Commission | Dynamic Discovery Client
- *
- * https://ec.europa.eu/cefdigital/code/projects/EDELIVERY/repos/dynamic-discovery-client/browse
- *
- * Licensed under the LGPL, Version 2.1 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * dynamic-discovery\License_LGPL-2.1.txt or https://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt
- *
- * 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.
- *
- * @author Flávio W. R. Santos - CEF-EDELIVERY-SUPPORT@ec.europa.eu
- * @author Adrien Ferial - CEF-EDELIVERY-SUPPORT@ec.europa.eu
- *
- */
package eu.europa.ec.cipa.smp.server.util;
import org.junit.Assert;
diff --git a/smp-server-library/src/test/java/eu/europa/ec/cipa/smp/server/util/IdentifierUtilsTest.java b/smp-server-library/src/test/java/eu/europa/ec/cipa/smp/server/util/IdentifierUtilsTest.java
index 1d5aff7ea927181a9b9da1d6a3809d4ff9be126c..323507de39fefeb5e896be04697a0a02fe2f2e57 100644
--- a/smp-server-library/src/test/java/eu/europa/ec/cipa/smp/server/util/IdentifierUtilsTest.java
+++ b/smp-server-library/src/test/java/eu/europa/ec/cipa/smp/server/util/IdentifierUtilsTest.java
@@ -1,12 +1,10 @@
/*
* Copyright 2017 European Commission | CEF eDelivery
*
- * Licensed under the EUPL, Version 1.1 or – as soon they will be approved by the European Commission - subsequent versions of the EUPL (the "Licence");
+ * Licensed 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:
- * https://joinup.ec.europa.eu/software/page/eupl
- * or file: LICENCE-EUPL-v1.1.pdf
+ * You may obtain a copy of the Licence attached in file: LICENCE-EUPL-v1.2.pdf
*
* 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.
diff --git a/smp-server-library/src/test/java/eu/europa/ec/cipa/smp/server/util/KeyStoreUtilsTest.java b/smp-server-library/src/test/java/eu/europa/ec/cipa/smp/server/util/KeyStoreUtilsTest.java
index aafddf24be8c4cf7512deb93c38bdd2a3c26cef4..a2a4a1aca1002af1cc74d2cc290a9849d9dd139f 100644
--- a/smp-server-library/src/test/java/eu/europa/ec/cipa/smp/server/util/KeyStoreUtilsTest.java
+++ b/smp-server-library/src/test/java/eu/europa/ec/cipa/smp/server/util/KeyStoreUtilsTest.java
@@ -1,12 +1,10 @@
/*
* Copyright 2017 European Commission | CEF eDelivery
*
- * Licensed under the EUPL, Version 1.1 or – as soon they will be approved by the European Commission - subsequent versions of the EUPL (the "Licence");
+ * Licensed 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:
- * https://joinup.ec.europa.eu/software/page/eupl
- * or file: LICENCE-EUPL-v1.1.pdf
+ * You may obtain a copy of the Licence attached in file: LICENCE-EUPL-v1.2.pdf
*
* 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.
diff --git a/smp-server-library/src/test/java/eu/europa/ec/cipa/smp/server/util/SMPDBUtilsTest.java b/smp-server-library/src/test/java/eu/europa/ec/cipa/smp/server/util/SMPDBUtilsTest.java
index 2664b63b1aac77317bf56ec7b540dd7031dca205..fcbb30287647feca24e223eb6eae61ec3e574253 100644
--- a/smp-server-library/src/test/java/eu/europa/ec/cipa/smp/server/util/SMPDBUtilsTest.java
+++ b/smp-server-library/src/test/java/eu/europa/ec/cipa/smp/server/util/SMPDBUtilsTest.java
@@ -1,12 +1,10 @@
/*
* Copyright 2017 European Commission | CEF eDelivery
*
- * Licensed under the EUPL, Version 1.1 or – as soon they will be approved by the European Commission - subsequent versions of the EUPL (the "Licence");
+ * Licensed 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:
- * https://joinup.ec.europa.eu/software/page/eupl
- * or file: LICENCE-EUPL-v1.1.pdf
+ * You may obtain a copy of the Licence attached in file: LICENCE-EUPL-v1.2.pdf
*
* 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.
diff --git a/smp-server-library/src/test/java/eu/europa/ec/cipa/smp/server/util/XmlTestUtils.java b/smp-server-library/src/test/java/eu/europa/ec/cipa/smp/server/util/XmlTestUtils.java
index e4a24627615d0665c208bcfbd34272df6602b55d..817fd8095383d741c9af83e168cc3e8f5b1f533f 100644
--- a/smp-server-library/src/test/java/eu/europa/ec/cipa/smp/server/util/XmlTestUtils.java
+++ b/smp-server-library/src/test/java/eu/europa/ec/cipa/smp/server/util/XmlTestUtils.java
@@ -1,12 +1,10 @@
/*
* Copyright 2017 European Commission | CEF eDelivery
*
- * Licensed under the EUPL, Version 1.1 or – as soon they will be approved by the European Commission - subsequent versions of the EUPL (the "Licence");
+ * Licensed 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:
- * https://joinup.ec.europa.eu/software/page/eupl
- * or file: LICENCE-EUPL-v1.1.pdf
+ * You may obtain a copy of the Licence attached in file: LICENCE-EUPL-v1.2.pdf
*
* 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.
diff --git a/smp-server-library/src/test/java/eu/europa/ec/edelivery/smp/config/SmpServicesTestConfig.java b/smp-server-library/src/test/java/eu/europa/ec/edelivery/smp/config/SmpServicesTestConfig.java
index 410d35269bb76e49f04a3de6bf0782e64c6cfcaf..182d0700e44128f1bc02ec5a97c5521f2970744a 100644
--- a/smp-server-library/src/test/java/eu/europa/ec/edelivery/smp/config/SmpServicesTestConfig.java
+++ b/smp-server-library/src/test/java/eu/europa/ec/edelivery/smp/config/SmpServicesTestConfig.java
@@ -1,12 +1,10 @@
/*
* Copyright 2017 European Commission | CEF eDelivery
*
- * Licensed under the EUPL, Version 1.1 or – as soon they will be approved by the European Commission - subsequent versions of the EUPL (the "Licence");
+ * Licensed 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:
- * https://joinup.ec.europa.eu/software/page/eupl
- * or file: LICENCE-EUPL-v1.1.pdf
+ * You may obtain a copy of the Licence attached in file: LICENCE-EUPL-v1.2.pdf
*
* 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.
diff --git a/smp-server-library/src/test/java/eu/europa/ec/edelivery/smp/services/ServiceGroupServiceIntegrationTest.java b/smp-server-library/src/test/java/eu/europa/ec/edelivery/smp/services/ServiceGroupServiceIntegrationTest.java
index baea2f99b7508a1777620394772e82325fb5b31e..b7cb21671206bb6225236ac859a2ca5e4b3409cb 100644
--- a/smp-server-library/src/test/java/eu/europa/ec/edelivery/smp/services/ServiceGroupServiceIntegrationTest.java
+++ b/smp-server-library/src/test/java/eu/europa/ec/edelivery/smp/services/ServiceGroupServiceIntegrationTest.java
@@ -1,12 +1,10 @@
/*
* Copyright 2017 European Commission | CEF eDelivery
*
- * Licensed under the EUPL, Version 1.1 or – as soon they will be approved by the European Commission - subsequent versions of the EUPL (the "Licence");
+ * Licensed 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:
- * https://joinup.ec.europa.eu/software/page/eupl
- * or file: LICENCE-EUPL-v1.1.pdf
+ * You may obtain a copy of the Licence attached in file: LICENCE-EUPL-v1.2.pdf
*
* 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.
diff --git a/smp-server-library/src/test/java/eu/europa/ec/edelivery/smp/services/ServiceMetadataIntegrationTest.java b/smp-server-library/src/test/java/eu/europa/ec/edelivery/smp/services/ServiceMetadataIntegrationTest.java
index 2243f2b03454b434ec63aba1ab064f9f379238f3..ef2d1d80c2392f4271b0479212306079e66c5812 100644
--- a/smp-server-library/src/test/java/eu/europa/ec/edelivery/smp/services/ServiceMetadataIntegrationTest.java
+++ b/smp-server-library/src/test/java/eu/europa/ec/edelivery/smp/services/ServiceMetadataIntegrationTest.java
@@ -1,12 +1,10 @@
/*
* Copyright 2017 European Commission | CEF eDelivery
*
- * Licensed under the EUPL, Version 1.1 or – as soon they will be approved by the European Commission - subsequent versions of the EUPL (the "Licence");
+ * Licensed 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:
- * https://joinup.ec.europa.eu/software/page/eupl
- * or file: LICENCE-EUPL-v1.1.pdf
+ * You may obtain a copy of the Licence attached in file: LICENCE-EUPL-v1.2.pdf
*
* 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.
diff --git a/smp-server-library/src/test/resources/config.properties b/smp-server-library/src/test/resources/config.properties
index 19798028313389725bb4fd1e9a88d6694fafb6d2..760ca4de509e4b09adc31792f910233f08009e46 100644
--- a/smp-server-library/src/test/resources/config.properties
+++ b/smp-server-library/src/test/resources/config.properties
@@ -1,12 +1,10 @@
#
# Copyright 2017 European Commission | CEF eDelivery
#
-# Licensed under the EUPL, Version 1.1 or � as soon they will be approved by the European Commission - subsequent versions of the EUPL (the "Licence");
+# Licensed 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:
-# https://joinup.ec.europa.eu/software/page/eupl
-# or file: LICENCE-EUPL-v1.1.pdf
+# You may obtain a copy of the Licence attached in file: LICENCE-EUPL-v1.2.pdf
#
# 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.
diff --git a/smp-server-library/src/test/resources/eu/europa/ec/cipa/smp/server/conversion/ServiceMetadataWithServiceInformationUtf8.xml b/smp-server-library/src/test/resources/eu/europa/ec/cipa/smp/server/conversion/ServiceMetadataWithServiceInformationUtf8.xml
index df6b5b9aad35c0e50df7fd564ea35961bd23ca43..5157afe6fc03d570e617e2e83b1d6824c6d6f01a 100644
--- a/smp-server-library/src/test/resources/eu/europa/ec/cipa/smp/server/conversion/ServiceMetadataWithServiceInformationUtf8.xml
+++ b/smp-server-library/src/test/resources/eu/europa/ec/cipa/smp/server/conversion/ServiceMetadataWithServiceInformationUtf8.xml
@@ -1,12 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?><!--
~ Copyright 2017 European Commission | CEF eDelivery
~
- ~ Licensed under the EUPL, Version 1.1 or – as soon they will be approved by the European Commission - subsequent versions of the EUPL (the "Licence");
+ ~ Licensed 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:
- ~ https://joinup.ec.europa.eu/software/page/eupl
- ~ or file: LICENCE-EUPL-v1.1.pdf
+ ~ You may obtain a copy of the Licence attached in file: LICENCE-EUPL-v1.2.pdf
~
~ 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.
diff --git a/smp-server-library/src/test/resources/log4j.properties b/smp-server-library/src/test/resources/log4j.properties
index 6eb2db2619d3ca8b6f4e21d55e002e2a5f7040c1..db1d3eea673c2a20416fc8e9ebf622521f3ae12e 100644
--- a/smp-server-library/src/test/resources/log4j.properties
+++ b/smp-server-library/src/test/resources/log4j.properties
@@ -1,12 +1,10 @@
#
# Copyright 2017 European Commission | CEF eDelivery
#
-# Licensed under the EUPL, Version 1.1 or � as soon they will be approved by the European Commission - subsequent versions of the EUPL (the "Licence");
+# Licensed 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:
-# https://joinup.ec.europa.eu/software/page/eupl
-# or file: LICENCE-EUPL-v1.1.pdf
+# You may obtain a copy of the Licence attached in file: LICENCE-EUPL-v1.2.pdf
#
# 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.
diff --git a/smp-webapp/README.txt b/smp-webapp/README.txt
deleted file mode 100644
index 8d9e0c3d4246dff83f67e0c91b3ef558caece903..0000000000000000000000000000000000000000
--- a/smp-webapp/README.txt
+++ /dev/null
@@ -1,65 +0,0 @@
-====
- Version: MPL 1.1/EUPL 1.1
-
- The contents of this file are subject to the Mozilla Public License Version
- 1.1 (the "License"); you may not use this file except in compliance with
- the License. You may obtain a copy of the License at:
- http://www.mozilla.org/MPL/
-
- Software distributed under the License is distributed on an "AS IS" basis,
- WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- for the specific language governing rights and limitations under the
- License.
-
- The Original Code is Copyright The PEPPOL project (http://www.peppol.eu)
-
- Alternatively, the contents of this file may be used under the
- terms of the EUPL, Version 1.1 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:
- http://joinup.ec.europa.eu/software/page/eupl/licence-eupl
-
- 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.
-
- If you wish to allow use of your version of this file only
- under the terms of the EUPL License and not to allow others to use
- your version of this file under the MPL, indicate your decision by
- deleting the provisions above and replace them with the notice and
- other provisions required by the EUPL License. If you do not delete
- the provisions above, a recipient may use your version of this file
- under either the MPL or the EUPL License.
-====
-
-Please provide the classpath to your smp keystore and the required passwords updating the config.propertied file
-under the src/main/resource. Typically you will place the keystore.jks file in a foder that you will add to your
-applications server classpath.
-
-Setting up tomcat:
-Tomcat must be set up with the following java system property:
-org.apache.tomcat.util.buf.UDecoder.ALLOW_ENCODED_SLASH = true
-
-This can be done by adding:
--Dorg.apache.tomcat.util.buf.UDecoder.ALLOW_ENCODED_SLASH="true"
-as a JVM argument. (Tomcat Properties -> Java -> Java Options) or
-put it into the catalina.sh in linux.
-
-Edit the catalina.sh with the following:
----------------------------------------------------------------------------------------------------------------------------------------------------------
-JAVA_OPTS="$JAVA_OPTS -Dorg.apache.tomcat.util.buf.UDecoder.ALLOW_ENCODED_SLASH=true"
----------------------------------------------------------------------------------------------------------------------------------------------------------
-
-Dependencies:
-If the ServiceMetadataPublishingCommonLibrary project has been updated then
-export the ServiceMetadataPublishingCommonLibrary project as a jar file to
-WebContent/lib/peppol-smp-common.jar
-
-Sql file to create the database from a backup is available under the src/etc folder
-
-If the deployed package is missing the metro framework; install it on the
-tomcat server.
\ No newline at end of file
diff --git a/smp-webapp/src/main/java/eu/europa/ec/edelivery/smp/config/DatabaseConfig.java b/smp-webapp/src/main/java/eu/europa/ec/edelivery/smp/config/DatabaseConfig.java
index 47f47a32f056be9e43e3f2efe7eb5ee35a4c4866..3cc3d974f0bb552d3bb90503e8600d7cc2a5bba7 100644
--- a/smp-webapp/src/main/java/eu/europa/ec/edelivery/smp/config/DatabaseConfig.java
+++ b/smp-webapp/src/main/java/eu/europa/ec/edelivery/smp/config/DatabaseConfig.java
@@ -1,12 +1,10 @@
/*
* Copyright 2017 European Commission | CEF eDelivery
*
- * Licensed under the EUPL, Version 1.1 or – as soon they will be approved by the European Commission - subsequent versions of the EUPL (the "Licence");
+ * Licensed 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:
- * https://joinup.ec.europa.eu/software/page/eupl
- * or file: LICENCE-EUPL-v1.1.pdf
+ * You may obtain a copy of the Licence attached in file: LICENCE-EUPL-v1.2.pdf
*
* 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.
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 91b4fc42b51ab7eeaee928403a4c3edabbdd34a0..c7bc38d264d8bd69b95b496b45e9bffb165f00ed 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
@@ -1,12 +1,10 @@
/*
* Copyright 2017 European Commission | CEF eDelivery
*
- * Licensed under the EUPL, Version 1.1 or – as soon they will be approved by the European Commission - subsequent versions of the EUPL (the "Licence");
+ * Licensed 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:
- * https://joinup.ec.europa.eu/software/page/eupl
- * or file: LICENCE-EUPL-v1.1.pdf
+ * You may obtain a copy of the Licence attached in file: LICENCE-EUPL-v1.2.pdf
*
* 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.
diff --git a/smp-webapp/src/main/java/eu/europa/ec/edelivery/smp/config/PropertiesConfig.java b/smp-webapp/src/main/java/eu/europa/ec/edelivery/smp/config/PropertiesConfig.java
index e8efd71607c03072bdd8f75f7f4601847bd2f684..bee89530710f9ed3f28a73252335bc72a92f0f33 100644
--- a/smp-webapp/src/main/java/eu/europa/ec/edelivery/smp/config/PropertiesConfig.java
+++ b/smp-webapp/src/main/java/eu/europa/ec/edelivery/smp/config/PropertiesConfig.java
@@ -1,12 +1,10 @@
/*
* Copyright 2017 European Commission | CEF eDelivery
*
- * Licensed under the EUPL, Version 1.1 or – as soon they will be approved by the European Commission - subsequent versions of the EUPL (the "Licence");
+ * Licensed 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:
- * https://joinup.ec.europa.eu/software/page/eupl
- * or file: LICENCE-EUPL-v1.1.pdf
+ * You may obtain a copy of the Licence attached in file: LICENCE-EUPL-v1.2.pdf
*
* 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.
diff --git a/smp-webapp/src/main/java/eu/europa/ec/edelivery/smp/config/SmpAppConfig.java b/smp-webapp/src/main/java/eu/europa/ec/edelivery/smp/config/SmpAppConfig.java
index ac0f45fd59d4cf9e469ba2484148ec6a4d0f5e42..aa0d2204118b6cc78bb2767e7f4cf5af811e5521 100644
--- a/smp-webapp/src/main/java/eu/europa/ec/edelivery/smp/config/SmpAppConfig.java
+++ b/smp-webapp/src/main/java/eu/europa/ec/edelivery/smp/config/SmpAppConfig.java
@@ -1,12 +1,10 @@
/*
* Copyright 2017 European Commission | CEF eDelivery
*
- * Licensed under the EUPL, Version 1.1 or – as soon they will be approved by the European Commission - subsequent versions of the EUPL (the "Licence");
+ * Licensed 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:
- * https://joinup.ec.europa.eu/software/page/eupl
- * or file: LICENCE-EUPL-v1.1.pdf
+ * You may obtain a copy of the Licence attached in file: LICENCE-EUPL-v1.2.pdf
*
* 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.
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 94fcbd09e97aacb673886711a941fe974474273e..0d41765457e21c72d04bbc056bd51fdfaf2354cf 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
@@ -1,12 +1,10 @@
/*
* Copyright 2017 European Commission | CEF eDelivery
*
- * Licensed under the EUPL, Version 1.1 or – as soon they will be approved by the European Commission - subsequent versions of the EUPL (the "Licence");
+ * Licensed 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:
- * https://joinup.ec.europa.eu/software/page/eupl
- * or file: LICENCE-EUPL-v1.1.pdf
+ * You may obtain a copy of the Licence attached in file: LICENCE-EUPL-v1.2.pdf
*
* 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.
diff --git a/smp-webapp/src/main/java/eu/europa/ec/edelivery/smp/config/SpringSecurityConfig.java b/smp-webapp/src/main/java/eu/europa/ec/edelivery/smp/config/SpringSecurityConfig.java
index 1552df24f21c05aadb529bb335a8074fdd4a5b5f..6cd40234dc81c86e54869c816c0be8bd63550f93 100644
--- a/smp-webapp/src/main/java/eu/europa/ec/edelivery/smp/config/SpringSecurityConfig.java
+++ b/smp-webapp/src/main/java/eu/europa/ec/edelivery/smp/config/SpringSecurityConfig.java
@@ -1,12 +1,10 @@
/*
* Copyright 2017 European Commission | CEF eDelivery
*
- * Licensed under the EUPL, Version 1.1 or – as soon they will be approved by the European Commission - subsequent versions of the EUPL (the "Licence");
+ * Licensed 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:
- * https://joinup.ec.europa.eu/software/page/eupl
- * or file: LICENCE-EUPL-v1.1.pdf
+ * You may obtain a copy of the Licence attached in file: LICENCE-EUPL-v1.2.pdf
*
* 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.
diff --git a/smp-webapp/src/main/java/eu/europa/ec/edelivery/smp/controllers/ServiceGroupController.java b/smp-webapp/src/main/java/eu/europa/ec/edelivery/smp/controllers/ServiceGroupController.java
index 0bfdca79dd57061075636f922783823da9dbccd1..7997d9a92bd5481d8288e5896cfda489349008e4 100644
--- a/smp-webapp/src/main/java/eu/europa/ec/edelivery/smp/controllers/ServiceGroupController.java
+++ b/smp-webapp/src/main/java/eu/europa/ec/edelivery/smp/controllers/ServiceGroupController.java
@@ -1,12 +1,10 @@
/*
* Copyright 2017 European Commission | CEF eDelivery
*
- * Licensed under the EUPL, Version 1.1 or – as soon they will be approved by the European Commission - subsequent versions of the EUPL (the "Licence");
+ * Licensed 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:
- * https://joinup.ec.europa.eu/software/page/eupl
- * or file: LICENCE-EUPL-v1.1.pdf
+ * You may obtain a copy of the Licence attached in file: LICENCE-EUPL-v1.2.pdf
*
* 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.
diff --git a/smp-webapp/src/main/java/eu/europa/ec/edelivery/smp/controllers/ServiceMetadataController.java b/smp-webapp/src/main/java/eu/europa/ec/edelivery/smp/controllers/ServiceMetadataController.java
index eff5c3f27b58dd937df7b5422f378b19de92f1e4..0bf25dbe07199ad94cff228b69b0d7412f4ffb55 100644
--- a/smp-webapp/src/main/java/eu/europa/ec/edelivery/smp/controllers/ServiceMetadataController.java
+++ b/smp-webapp/src/main/java/eu/europa/ec/edelivery/smp/controllers/ServiceMetadataController.java
@@ -1,12 +1,10 @@
/*
* Copyright 2017 European Commission | CEF eDelivery
*
- * Licensed under the EUPL, Version 1.1 or – as soon they will be approved by the European Commission - subsequent versions of the EUPL (the "Licence");
+ * Licensed 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:
- * https://joinup.ec.europa.eu/software/page/eupl
- * or file: LICENCE-EUPL-v1.1.pdf
+ * You may obtain a copy of the Licence attached in file: LICENCE-EUPL-v1.2.pdf
*
* 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.
diff --git a/smp-webapp/src/main/java/eu/europa/ec/edelivery/smp/controllers/ServiceMetadataPathBuilder.java b/smp-webapp/src/main/java/eu/europa/ec/edelivery/smp/controllers/ServiceMetadataPathBuilder.java
index 6d45c434c46d18c8dab52f343178f53a2b94cd68..0c692555c2882839f7ab17a9d5644b0c1feba030 100644
--- a/smp-webapp/src/main/java/eu/europa/ec/edelivery/smp/controllers/ServiceMetadataPathBuilder.java
+++ b/smp-webapp/src/main/java/eu/europa/ec/edelivery/smp/controllers/ServiceMetadataPathBuilder.java
@@ -1,12 +1,10 @@
/*
* Copyright 2017 European Commission | CEF eDelivery
*
- * Licensed under the EUPL, Version 1.1 or – as soon they will be approved by the European Commission - subsequent versions of the EUPL (the "Licence");
+ * Licensed 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:
- * https://joinup.ec.europa.eu/software/page/eupl
- * or file: LICENCE-EUPL-v1.1.pdf
+ * You may obtain a copy of the Licence attached in file: LICENCE-EUPL-v1.2.pdf
*
* 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.
diff --git a/smp-webapp/src/main/java/eu/europa/ec/edelivery/smp/error/ErrorBusinessCode.java b/smp-webapp/src/main/java/eu/europa/ec/edelivery/smp/error/ErrorBusinessCode.java
index e3d7dcd63e8e8725fed6390176657f05b0524a84..09b63ea2a714201dd1653c52768476c33a4e0cfd 100644
--- a/smp-webapp/src/main/java/eu/europa/ec/edelivery/smp/error/ErrorBusinessCode.java
+++ b/smp-webapp/src/main/java/eu/europa/ec/edelivery/smp/error/ErrorBusinessCode.java
@@ -1,27 +1,10 @@
/*
* Copyright 2017 European Commission | CEF eDelivery
*
- * Licensed under the EUPL, Version 1.1 or – as soon they will be approved by the European Commission - subsequent versions of the EUPL (the "Licence");
+ * Licensed 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:
- * https://joinup.ec.europa.eu/software/page/eupl
- * or file: LICENCE-EUPL-v1.1.pdf
- *
- * 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.
- */
-
-/*
- * Copyright 2017 European Commission | CEF eDelivery
- *
- * Licensed under the EUPL, Version 1.1 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:
- * https://joinup.ec.europa.eu/software/page/eupl
- * or file: LICENCE-EUPL-v1.1.pdf
+ * You may obtain a copy of the Licence attached in file: LICENCE-EUPL-v1.2.pdf
*
* 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.
diff --git a/smp-webapp/src/main/java/eu/europa/ec/edelivery/smp/error/ErrorMappingControllerAdvice.java b/smp-webapp/src/main/java/eu/europa/ec/edelivery/smp/error/ErrorMappingControllerAdvice.java
index f4fa2e6e4afaab25344c952b9fa10eeed194d79d..08828e1c69bf08d05b044d0bde67550199579a6d 100644
--- a/smp-webapp/src/main/java/eu/europa/ec/edelivery/smp/error/ErrorMappingControllerAdvice.java
+++ b/smp-webapp/src/main/java/eu/europa/ec/edelivery/smp/error/ErrorMappingControllerAdvice.java
@@ -1,27 +1,10 @@
/*
* Copyright 2017 European Commission | CEF eDelivery
*
- * Licensed under the EUPL, Version 1.1 or – as soon they will be approved by the European Commission - subsequent versions of the EUPL (the "Licence");
+ * Licensed 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:
- * https://joinup.ec.europa.eu/software/page/eupl
- * or file: LICENCE-EUPL-v1.1.pdf
- *
- * 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.
- */
-
-/*
- * Copyright 2017 European Commission | CEF eDelivery
- *
- * Licensed under the EUPL, Version 1.1 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:
- * https://joinup.ec.europa.eu/software/page/eupl
- * or file: LICENCE-EUPL-v1.1.pdf
+ * You may obtain a copy of the Licence attached in file: LICENCE-EUPL-v1.2.pdf
*
* 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.
diff --git a/smp-webapp/src/main/java/eu/europa/ec/edelivery/smp/error/ErrorResponseBuilder.java b/smp-webapp/src/main/java/eu/europa/ec/edelivery/smp/error/ErrorResponseBuilder.java
index 37184cf79296932d8e918cb785088be988e8722f..ba6b57bfc2f0a11269d6ba1a75a0d9655a8c4b42 100644
--- a/smp-webapp/src/main/java/eu/europa/ec/edelivery/smp/error/ErrorResponseBuilder.java
+++ b/smp-webapp/src/main/java/eu/europa/ec/edelivery/smp/error/ErrorResponseBuilder.java
@@ -1,12 +1,10 @@
/*
* Copyright 2017 European Commission | CEF eDelivery
*
- * Licensed under the EUPL, Version 1.1 or – as soon they will be approved by the European Commission - subsequent versions of the EUPL (the "Licence");
+ * Licensed 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:
- * https://joinup.ec.europa.eu/software/page/eupl
- * or file: LICENCE-EUPL-v1.1.pdf
+ * You may obtain a copy of the Licence attached in file: LICENCE-EUPL-v1.2.pdf
*
* 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.
diff --git a/smp-webapp/src/main/java/eu/europa/ec/edelivery/smp/error/SpringSecurityExceptionHandler.java b/smp-webapp/src/main/java/eu/europa/ec/edelivery/smp/error/SpringSecurityExceptionHandler.java
index 308f7979008078ec38dac09ee64d1ab551a82095..4d7436c53a02f6462295a974181f43f4bdd386fb 100644
--- a/smp-webapp/src/main/java/eu/europa/ec/edelivery/smp/error/SpringSecurityExceptionHandler.java
+++ b/smp-webapp/src/main/java/eu/europa/ec/edelivery/smp/error/SpringSecurityExceptionHandler.java
@@ -1,42 +1,10 @@
/*
* Copyright 2017 European Commission | CEF eDelivery
*
- * Licensed under the EUPL, Version 1.1 or – as soon they will be approved by the European Commission - subsequent versions of the EUPL (the "Licence");
+ * Licensed 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:
- * https://joinup.ec.europa.eu/software/page/eupl
- * or file: LICENCE-EUPL-v1.1.pdf
- *
- * 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.
- */
-
-/*
- * Copyright 2017 European Commission | CEF eDelivery
- *
- * Licensed under the EUPL, Version 1.1 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:
- * https://joinup.ec.europa.eu/software/page/eupl
- * or file: LICENCE-EUPL-v1.1.pdf
- *
- * 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.
- */
-
-/*
- * Copyright 2017 European Commission | CEF eDelivery
- *
- * Licensed under the EUPL, Version 1.1 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:
- * https://joinup.ec.europa.eu/software/page/eupl
- * or file: LICENCE-EUPL-v1.1.pdf
+ * You may obtain a copy of the Licence attached in file: LICENCE-EUPL-v1.2.pdf
*
* 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.
diff --git a/smp-webapp/src/main/java/eu/europa/ec/edelivery/smp/error/exceptions/BadRequestException.java b/smp-webapp/src/main/java/eu/europa/ec/edelivery/smp/error/exceptions/BadRequestException.java
index 04514c07f299b33866cd50d2917bd9de58bc26b1..05afb9e5059ff447ccb298c235935195ad59f79e 100644
--- a/smp-webapp/src/main/java/eu/europa/ec/edelivery/smp/error/exceptions/BadRequestException.java
+++ b/smp-webapp/src/main/java/eu/europa/ec/edelivery/smp/error/exceptions/BadRequestException.java
@@ -1,42 +1,10 @@
/*
* Copyright 2017 European Commission | CEF eDelivery
*
- * Licensed under the EUPL, Version 1.1 or – as soon they will be approved by the European Commission - subsequent versions of the EUPL (the "Licence");
+ * Licensed 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:
- * https://joinup.ec.europa.eu/software/page/eupl
- * or file: LICENCE-EUPL-v1.1.pdf
- *
- * 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.
- */
-
-/*
- * Copyright 2017 European Commission | CEF eDelivery
- *
- * Licensed under the EUPL, Version 1.1 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:
- * https://joinup.ec.europa.eu/software/page/eupl
- * or file: LICENCE-EUPL-v1.1.pdf
- *
- * 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.
- */
-
-/*
- * Copyright 2017 European Commission | CEF eDelivery
- *
- * Licensed under the EUPL, Version 1.1 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:
- * https://joinup.ec.europa.eu/software/page/eupl
- * or file: LICENCE-EUPL-v1.1.pdf
+ * You may obtain a copy of the Licence attached in file: LICENCE-EUPL-v1.2.pdf
*
* 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.
diff --git a/smp-webapp/src/main/java/eu/europa/ec/edelivery/smp/validation/ServiceGroupValidator.java b/smp-webapp/src/main/java/eu/europa/ec/edelivery/smp/validation/ServiceGroupValidator.java
index e91964bff15720bd9e47f6a84426ec9bc04eafae..1b6e136611505b546f2a70483048a1f6e3217336 100644
--- a/smp-webapp/src/main/java/eu/europa/ec/edelivery/smp/validation/ServiceGroupValidator.java
+++ b/smp-webapp/src/main/java/eu/europa/ec/edelivery/smp/validation/ServiceGroupValidator.java
@@ -1,27 +1,10 @@
/*
* Copyright 2017 European Commission | CEF eDelivery
*
- * Licensed under the EUPL, Version 1.1 or – as soon they will be approved by the European Commission - subsequent versions of the EUPL (the "Licence");
+ * Licensed 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:
- * https://joinup.ec.europa.eu/software/page/eupl
- * or file: LICENCE-EUPL-v1.1.pdf
- *
- * 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.
- */
-
-/*
- * Copyright 2017 European Commission | CEF eDelivery
- *
- * Licensed under the EUPL, Version 1.1 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:
- * https://joinup.ec.europa.eu/software/page/eupl
- * or file: LICENCE-EUPL-v1.1.pdf
+ * You may obtain a copy of the Licence attached in file: LICENCE-EUPL-v1.2.pdf
*
* 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.
diff --git a/smp-webapp/src/main/java/eu/europa/ec/edelivery/smp/validation/ServiceMetadataValidator.java b/smp-webapp/src/main/java/eu/europa/ec/edelivery/smp/validation/ServiceMetadataValidator.java
index 5836063ee1cd8a3eeb71e6f1513ee1a545675743..fc387cb67f5cbc4c4a7ce23b71d5764edd872e63 100644
--- a/smp-webapp/src/main/java/eu/europa/ec/edelivery/smp/validation/ServiceMetadataValidator.java
+++ b/smp-webapp/src/main/java/eu/europa/ec/edelivery/smp/validation/ServiceMetadataValidator.java
@@ -1,12 +1,10 @@
/*
* Copyright 2017 European Commission | CEF eDelivery
*
- * Licensed under the EUPL, Version 1.1 or – as soon they will be approved by the European Commission - subsequent versions of the EUPL (the "Licence");
+ * Licensed 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:
- * https://joinup.ec.europa.eu/software/page/eupl
- * or file: LICENCE-EUPL-v1.1.pdf
+ * You may obtain a copy of the Licence attached in file: LICENCE-EUPL-v1.2.pdf
*
* 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.
diff --git a/smp-webapp/src/main/resources/config.properties b/smp-webapp/src/main/resources/config.properties
index 5f68dbcb9977753b3df8b39825cdeda136e4810d..c7c68a607ca9017cf1ece4c1aa90dcb2220fec11 100644
--- a/smp-webapp/src/main/resources/config.properties
+++ b/smp-webapp/src/main/resources/config.properties
@@ -1,12 +1,10 @@
#
# Copyright 2017 European Commission | CEF eDelivery
#
-# Licensed under the EUPL, Version 1.1 or � as soon they will be approved by the European Commission - subsequent versions of the EUPL (the "Licence");
+# Licensed 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:
-# https://joinup.ec.europa.eu/software/page/eupl
-# or file: LICENCE-EUPL-v1.1.pdf
+# You may obtain a copy of the Licence attached in file: LICENCE-EUPL-v1.2.pdf
#
# 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.
diff --git a/smp-webapp/src/main/resources/log4j.properties b/smp-webapp/src/main/resources/log4j.properties
index ed838ddbaf81bc20af16a66fbc5f0f2a789f5663..aeee963b02f1bdb0d0e0069ec1d6e9fbf6d32865 100644
--- a/smp-webapp/src/main/resources/log4j.properties
+++ b/smp-webapp/src/main/resources/log4j.properties
@@ -1,12 +1,10 @@
#
# Copyright 2017 European Commission | CEF eDelivery
#
-# Licensed under the EUPL, Version 1.1 or � as soon they will be approved by the European Commission - subsequent versions of the EUPL (the "Licence");
+# Licensed 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:
-# https://joinup.ec.europa.eu/software/page/eupl
-# or file: LICENCE-EUPL-v1.1.pdf
+# You may obtain a copy of the Licence attached in file: LICENCE-EUPL-v1.2.pdf
#
# 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.
diff --git a/smp-webapp/src/main/resources/spring-security.xml b/smp-webapp/src/main/resources/spring-security.xml
index 08d47ff59788498e826afc8b3741c94a9d7b7378..3d9202216d2b35c1a15504aba1f44861d213befd 100644
--- a/smp-webapp/src/main/resources/spring-security.xml
+++ b/smp-webapp/src/main/resources/spring-security.xml
@@ -1,12 +1,10 @@
<!--
~ Copyright 2017 European Commission | CEF eDelivery
~
- ~ Licensed under the EUPL, Version 1.1 or – as soon they will be approved by the European Commission - subsequent versions of the EUPL (the "Licence");
+ ~ Licensed 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:
- ~ https://joinup.ec.europa.eu/software/page/eupl
- ~ or file: LICENCE-EUPL-v1.1.pdf
+ ~ You may obtain a copy of the Licence attached in file: LICENCE-EUPL-v1.2.pdf
~
~ 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.
diff --git a/smp-webapp/src/main/webapp/WEB-INF/jboss-deployment-structure.xml b/smp-webapp/src/main/webapp/WEB-INF/jboss-deployment-structure.xml
index 142aa88fc8d116f25d3ab37a0b152ed65e44da42..2c9994de4f819e05e3ce3047a06b22366e3ebb43 100644
--- a/smp-webapp/src/main/webapp/WEB-INF/jboss-deployment-structure.xml
+++ b/smp-webapp/src/main/webapp/WEB-INF/jboss-deployment-structure.xml
@@ -2,12 +2,10 @@
<!--
~ Copyright 2017 European Commission | CEF eDelivery
~
- ~ Licensed under the EUPL, Version 1.1 or – as soon they will be approved by the European Commission - subsequent versions of the EUPL (the "Licence");
+ ~ Licensed 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:
- ~ https://joinup.ec.europa.eu/software/page/eupl
- ~ or file: LICENCE-EUPL-v1.1.pdf
+ ~ You may obtain a copy of the Licence attached in file: LICENCE-EUPL-v1.2.pdf
~
~ 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.
diff --git a/smp-webapp/src/main/webapp/WEB-INF/web.xml b/smp-webapp/src/main/webapp/WEB-INF/web.xml
index f3c817509c849aa4ec9abdd84f825257c588d594..81c274230a442de895ef414c2e1c25e2ba12f455 100644
--- a/smp-webapp/src/main/webapp/WEB-INF/web.xml
+++ b/smp-webapp/src/main/webapp/WEB-INF/web.xml
@@ -2,12 +2,10 @@
<!--
~ Copyright 2017 European Commission | CEF eDelivery
~
- ~ Licensed under the EUPL, Version 1.1 or – as soon they will be approved by the European Commission - subsequent versions of the EUPL (the "Licence");
+ ~ Licensed 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:
- ~ https://joinup.ec.europa.eu/software/page/eupl
- ~ or file: LICENCE-EUPL-v1.1.pdf
+ ~ You may obtain a copy of the Licence attached in file: LICENCE-EUPL-v1.2.pdf
~
~ 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.
diff --git a/smp-webapp/src/main/webapp/WEB-INF/weblogic.xml b/smp-webapp/src/main/webapp/WEB-INF/weblogic.xml
index 415851dd2466f89cc23e169e68c3e8f018eb9281..ddba27828aa2f5ee7de88291db4a65d35fb6697b 100644
--- a/smp-webapp/src/main/webapp/WEB-INF/weblogic.xml
+++ b/smp-webapp/src/main/webapp/WEB-INF/weblogic.xml
@@ -2,12 +2,10 @@
<!--
~ Copyright 2017 European Commission | CEF eDelivery
~
- ~ Licensed under the EUPL, Version 1.1 or � as soon they will be approved by the European Commission - subsequent versions of the EUPL (the "Licence");
+ ~ Licensed 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:
- ~ https://joinup.ec.europa.eu/software/page/eupl
- ~ or file: LICENCE-EUPL-v1.1.pdf
+ ~ You may obtain a copy of the Licence attached in file: LICENCE-EUPL-v1.2.pdf
~
~ 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.
diff --git a/smp-webapp/src/main/webapp/web/index.html b/smp-webapp/src/main/webapp/web/index.html
index 76c562c966df18d32e7cc5bde100c34a1af6dd46..c870461f34bb9403b114bc7d70049ebddff11df0 100644
--- a/smp-webapp/src/main/webapp/web/index.html
+++ b/smp-webapp/src/main/webapp/web/index.html
@@ -1,12 +1,10 @@
<!--
~ Copyright 2017 European Commission | CEF eDelivery
~
- ~ Licensed under the EUPL, Version 1.1 or – as soon they will be approved by the European Commission - subsequent versions of the EUPL (the "Licence");
+ ~ Licensed 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:
- ~ https://joinup.ec.europa.eu/software/page/eupl
- ~ or file: LICENCE-EUPL-v1.1.pdf
+ ~ You may obtain a copy of the Licence attached in file: LICENCE-EUPL-v1.2.pdf
~
~ 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.
diff --git a/smp-webapp/src/test/java/eu/europa/ec/cipa/smp/server/security/SecurityConfigurationTest.java b/smp-webapp/src/test/java/eu/europa/ec/cipa/smp/server/security/SecurityConfigurationTest.java
index 66d54c745d80149bfc266847ccd8885ba84e42df..6c5e4ecfd88849bf95c6aeba196f30af23a7f086 100644
--- a/smp-webapp/src/test/java/eu/europa/ec/cipa/smp/server/security/SecurityConfigurationTest.java
+++ b/smp-webapp/src/test/java/eu/europa/ec/cipa/smp/server/security/SecurityConfigurationTest.java
@@ -1,12 +1,10 @@
/*
* Copyright 2017 European Commission | CEF eDelivery
*
- * Licensed under the EUPL, Version 1.1 or – as soon they will be approved by the European Commission - subsequent versions of the EUPL (the "Licence");
+ * Licensed 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:
- * https://joinup.ec.europa.eu/software/page/eupl
- * or file: LICENCE-EUPL-v1.1.pdf
+ * You may obtain a copy of the Licence attached in file: LICENCE-EUPL-v1.2.pdf
*
* 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.
diff --git a/smp-webapp/src/test/java/eu/europa/ec/cipa/smp/server/security/SignatureUtil.java b/smp-webapp/src/test/java/eu/europa/ec/cipa/smp/server/security/SignatureUtil.java
index 82fd5dcfacb01968eda482d5414356d9c89c6d84..5abf7ac88e0b6537ea15366df7800aa729833cb2 100644
--- a/smp-webapp/src/test/java/eu/europa/ec/cipa/smp/server/security/SignatureUtil.java
+++ b/smp-webapp/src/test/java/eu/europa/ec/cipa/smp/server/security/SignatureUtil.java
@@ -1,12 +1,10 @@
/*
* Copyright 2017 European Commission | CEF eDelivery
*
- * Licensed under the EUPL, Version 1.1 or – as soon they will be approved by the European Commission - subsequent versions of the EUPL (the "Licence");
+ * Licensed 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:
- * https://joinup.ec.europa.eu/software/page/eupl
- * or file: LICENCE-EUPL-v1.1.pdf
+ * You may obtain a copy of the Licence attached in file: LICENCE-EUPL-v1.2.pdf
*
* 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.
diff --git a/smp-webapp/src/test/java/eu/europa/ec/cipa/smp/server/security/SignatureValidatorTest.java b/smp-webapp/src/test/java/eu/europa/ec/cipa/smp/server/security/SignatureValidatorTest.java
index b43b781c188820c29883f66b8b4ae4c24d7899cf..c6a7687e764f8acc9e97f21aaa739ef5fa27b1cf 100644
--- a/smp-webapp/src/test/java/eu/europa/ec/cipa/smp/server/security/SignatureValidatorTest.java
+++ b/smp-webapp/src/test/java/eu/europa/ec/cipa/smp/server/security/SignatureValidatorTest.java
@@ -1,12 +1,10 @@
/*
* Copyright 2017 European Commission | CEF eDelivery
*
- * Licensed under the EUPL, Version 1.1 or – as soon they will be approved by the European Commission - subsequent versions of the EUPL (the "Licence");
+ * Licensed 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:
- * https://joinup.ec.europa.eu/software/page/eupl
- * or file: LICENCE-EUPL-v1.1.pdf
+ * You may obtain a copy of the Licence attached in file: LICENCE-EUPL-v1.2.pdf
*
* 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.
diff --git a/smp-webapp/src/test/java/eu/europa/ec/cipa/smp/server/security/UsernameReturningTestController.java b/smp-webapp/src/test/java/eu/europa/ec/cipa/smp/server/security/UsernameReturningTestController.java
index 1fed7b51ba5b75d7eb2fcce5fa96df0712f638d2..fa24eadb48242d08dbb1f2849e6cc81b6a1d66d7 100644
--- a/smp-webapp/src/test/java/eu/europa/ec/cipa/smp/server/security/UsernameReturningTestController.java
+++ b/smp-webapp/src/test/java/eu/europa/ec/cipa/smp/server/security/UsernameReturningTestController.java
@@ -1,12 +1,10 @@
/*
* Copyright 2017 European Commission | CEF eDelivery
*
- * Licensed under the EUPL, Version 1.1 or – as soon they will be approved by the European Commission - subsequent versions of the EUPL (the "Licence");
+ * Licensed 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:
- * https://joinup.ec.europa.eu/software/page/eupl
- * or file: LICENCE-EUPL-v1.1.pdf
+ * You may obtain a copy of the Licence attached in file: LICENCE-EUPL-v1.2.pdf
*
* 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.
diff --git a/smp-webapp/src/test/java/eu/europa/ec/cipa/smp/server/security/X509KeySelector.java b/smp-webapp/src/test/java/eu/europa/ec/cipa/smp/server/security/X509KeySelector.java
index 8c6a4aaad2a022f4f077e3b34d8c5ba620c4e373..9d585911c7e4207afbe9574cff4ed241f139d9c7 100644
--- a/smp-webapp/src/test/java/eu/europa/ec/cipa/smp/server/security/X509KeySelector.java
+++ b/smp-webapp/src/test/java/eu/europa/ec/cipa/smp/server/security/X509KeySelector.java
@@ -1,12 +1,10 @@
/*
* Copyright 2017 European Commission | CEF eDelivery
*
- * Licensed under the EUPL, Version 1.1 or – as soon they will be approved by the European Commission - subsequent versions of the EUPL (the "Licence");
+ * Licensed 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:
- * https://joinup.ec.europa.eu/software/page/eupl
- * or file: LICENCE-EUPL-v1.1.pdf
+ * You may obtain a copy of the Licence attached in file: LICENCE-EUPL-v1.2.pdf
*
* 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.
diff --git a/smp-webapp/src/test/java/eu/europa/ec/cipa/smp/server/util/DefaultHttpHeader.java b/smp-webapp/src/test/java/eu/europa/ec/cipa/smp/server/util/DefaultHttpHeader.java
index f043f471ee7104fe2052ba826fed9d2d363cece3..b993b9abf3060119aac6a7118fe1f3c5433d7f71 100644
--- a/smp-webapp/src/test/java/eu/europa/ec/cipa/smp/server/util/DefaultHttpHeader.java
+++ b/smp-webapp/src/test/java/eu/europa/ec/cipa/smp/server/util/DefaultHttpHeader.java
@@ -1,12 +1,10 @@
/*
* Copyright 2017 European Commission | CEF eDelivery
*
- * Licensed under the EUPL, Version 1.1 or – as soon they will be approved by the European Commission - subsequent versions of the EUPL (the "Licence");
+ * Licensed 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:
- * https://joinup.ec.europa.eu/software/page/eupl
- * or file: LICENCE-EUPL-v1.1.pdf
+ * You may obtain a copy of the Licence attached in file: LICENCE-EUPL-v1.2.pdf
*
* 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.
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 37a6a93eb431ae14fa71d9b7239e6c21b3fcff33..ba96ee4e7399ec0a3812728d33d5183cbd3e6132 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
@@ -1,12 +1,10 @@
/*
* Copyright 2017 European Commission | CEF eDelivery
*
- * Licensed under the EUPL, Version 1.1 or – as soon they will be approved by the European Commission - subsequent versions of the EUPL (the "Licence");
+ * Licensed 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:
- * https://joinup.ec.europa.eu/software/page/eupl
- * or file: LICENCE-EUPL-v1.1.pdf
+ * You may obtain a copy of the Licence attached in file: LICENCE-EUPL-v1.2.pdf
*
* 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.
diff --git a/smp-webapp/src/test/java/eu/europa/ec/edelivery/smp/config/SpringSecurityTestConfig.java b/smp-webapp/src/test/java/eu/europa/ec/edelivery/smp/config/SpringSecurityTestConfig.java
index 3effb467423e97ff1083782f77f9310ce05e020e..34b1e1d43311a2a8718c32ecaf962c93d71002bf 100644
--- a/smp-webapp/src/test/java/eu/europa/ec/edelivery/smp/config/SpringSecurityTestConfig.java
+++ b/smp-webapp/src/test/java/eu/europa/ec/edelivery/smp/config/SpringSecurityTestConfig.java
@@ -1,12 +1,10 @@
/*
* Copyright 2017 European Commission | CEF eDelivery
*
- * Licensed under the EUPL, Version 1.1 or – as soon they will be approved by the European Commission - subsequent versions of the EUPL (the "Licence");
+ * Licensed 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:
- * https://joinup.ec.europa.eu/software/page/eupl
- * or file: LICENCE-EUPL-v1.1.pdf
+ * You may obtain a copy of the Licence attached in file: LICENCE-EUPL-v1.2.pdf
*
* 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.
diff --git a/smp-webapp/src/test/java/eu/europa/ec/edelivery/smp/controllers/ServiceGroupControllerTest.java b/smp-webapp/src/test/java/eu/europa/ec/edelivery/smp/controllers/ServiceGroupControllerTest.java
index 0c91a51587549d38b6b26cd99ae5ab7e17630a65..4d551826272d0f52d0c8d05029e65023bb35c483 100644
--- a/smp-webapp/src/test/java/eu/europa/ec/edelivery/smp/controllers/ServiceGroupControllerTest.java
+++ b/smp-webapp/src/test/java/eu/europa/ec/edelivery/smp/controllers/ServiceGroupControllerTest.java
@@ -1,12 +1,10 @@
/*
* Copyright 2017 European Commission | CEF eDelivery
*
- * Licensed under the EUPL, Version 1.1 or – as soon they will be approved by the European Commission - subsequent versions of the EUPL (the "Licence");
+ * Licensed 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:
- * https://joinup.ec.europa.eu/software/page/eupl
- * or file: LICENCE-EUPL-v1.1.pdf
+ * You may obtain a copy of the Licence attached in file: LICENCE-EUPL-v1.2.pdf
*
* 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.
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 da4da1622e525d888e25d292906d83c1da1a9a91..81ec433bacc5f1efad2f8031fdb366e5d7a0f5c4 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
@@ -1,27 +1,10 @@
/*
* Copyright 2017 European Commission | CEF eDelivery
*
- * Licensed under the EUPL, Version 1.1 or – as soon they will be approved by the European Commission - subsequent versions of the EUPL (the "Licence");
+ * Licensed 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:
- * https://joinup.ec.europa.eu/software/page/eupl
- * or file: LICENCE-EUPL-v1.1.pdf
- *
- * 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.
- */
-
-/*
- * Copyright 2017 European Commission | CEF eDelivery
- *
- * Licensed under the EUPL, Version 1.1 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:
- * https://joinup.ec.europa.eu/software/page/eupl
- * or file: LICENCE-EUPL-v1.1.pdf
+ * You may obtain a copy of the Licence attached in file: LICENCE-EUPL-v1.2.pdf
*
* 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.
diff --git a/smp-webapp/src/test/java/eu/europa/ec/edelivery/smp/validation/ServiceGroupValidatorTest.java b/smp-webapp/src/test/java/eu/europa/ec/edelivery/smp/validation/ServiceGroupValidatorTest.java
index f62c448ae651e4bfc952ffc968cb187cc139747b..e7299f0975d62674dd257b833786df503225830a 100644
--- a/smp-webapp/src/test/java/eu/europa/ec/edelivery/smp/validation/ServiceGroupValidatorTest.java
+++ b/smp-webapp/src/test/java/eu/europa/ec/edelivery/smp/validation/ServiceGroupValidatorTest.java
@@ -1,42 +1,10 @@
/*
* Copyright 2017 European Commission | CEF eDelivery
*
- * Licensed under the EUPL, Version 1.1 or – as soon they will be approved by the European Commission - subsequent versions of the EUPL (the "Licence");
+ * Licensed 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:
- * https://joinup.ec.europa.eu/software/page/eupl
- * or file: LICENCE-EUPL-v1.1.pdf
- *
- * 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.
- */
-
-/*
- * Copyright 2017 European Commission | CEF eDelivery
- *
- * Licensed under the EUPL, Version 1.1 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:
- * https://joinup.ec.europa.eu/software/page/eupl
- * or file: LICENCE-EUPL-v1.1.pdf
- *
- * 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.
- */
-
-/*
- * Copyright 2017 European Commission | CEF eDelivery
- *
- * Licensed under the EUPL, Version 1.1 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:
- * https://joinup.ec.europa.eu/software/page/eupl
- * or file: LICENCE-EUPL-v1.1.pdf
+ * You may obtain a copy of the Licence attached in file: LICENCE-EUPL-v1.2.pdf
*
* 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.
diff --git a/smp-webapp/src/test/resources/config.properties b/smp-webapp/src/test/resources/config.properties
index 6315af3bac81efdb8746795b728de4ccefa1933c..7faef3109f9144c030a0bcb6877129940ecb1621 100644
--- a/smp-webapp/src/test/resources/config.properties
+++ b/smp-webapp/src/test/resources/config.properties
@@ -1,12 +1,10 @@
#
# Copyright 2017 European Commission | CEF eDelivery
#
-# Licensed under the EUPL, Version 1.1 or � as soon they will be approved by the European Commission - subsequent versions of the EUPL (the "Licence");
+# Licensed 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:
-# https://joinup.ec.europa.eu/software/page/eupl
-# or file: LICENCE-EUPL-v1.1.pdf
+# You may obtain a copy of the Licence attached in file: LICENCE-EUPL-v1.2.pdf
#
# 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.
diff --git a/smp-webapp/src/test/resources/spring-security-test-context.xml b/smp-webapp/src/test/resources/spring-security-test-context.xml
index d68a9f5125663ed46174d2b87140a26924e90cd9..3c5b46a1f06a0c97e6ad31653cf3c9a792469db0 100644
--- a/smp-webapp/src/test/resources/spring-security-test-context.xml
+++ b/smp-webapp/src/test/resources/spring-security-test-context.xml
@@ -2,12 +2,10 @@
<!--
~ Copyright 2017 European Commission | CEF eDelivery
~
- ~ Licensed under the EUPL, Version 1.1 or – as soon they will be approved by the European Commission - subsequent versions of the EUPL (the "Licence");
+ ~ Licensed 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:
- ~ https://joinup.ec.europa.eu/software/page/eupl
- ~ or file: LICENCE-EUPL-v1.1.pdf
+ ~ You may obtain a copy of the Licence attached in file: LICENCE-EUPL-v1.2.pdf
~
~ 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.