Merge branch 'master' into nightlybuild

# Conflicts:
#	build_reporting/pom.xml
#	connector/pom.xml
#	infos/history.txt
#	infos/readme_1.2.4.md
#	modules/authmodule-eIDAS-v2/pom.xml
#	modules/authmodule-eIDAS-v2/src/main/java/at/asitplus/eidas/specific/modules/auth/eidas/v2/szr/SzrClient.java
#	modules/authmodule-eIDAS-v2/src/main/java/at/asitplus/eidas/specific/modules/auth/eidas/v2/tasks/CreateIdentityLinkTask.java
#	modules/authmodule-eIDAS-v2/src/test/java/at/asitplus/eidas/specific/modules/auth/eidas/v2/test/SzrClientTestProduction.java
#	modules/authmodule-eIDAS-v2/src/test/java/at/asitplus/eidas/specific/modules/auth/eidas/v2/test/tasks/CreateIdentityLinkTaskEidNewTest.java
#	modules/core_common_lib/pom.xml
#	modules/pom.xml
#	pom.xml

4 files changed, 15 insertions, 13 deletions

diff --git a/connector/pom.xml b/connector/pom.xml
index 08e83cd8..9ffc4969 100644
--- a/connector/pom.xml
+++ b/connector/pom.xml
@@ -63,15 +63,15 @@
       <artifactId>spring-boot-starter-actuator</artifactId>
     </dependency>
     <dependency>
+      <groupId>org.springframework.boot</groupId>
+      <artifactId>spring-boot-starter-web</artifactId>
+      <exclusions>
+        <exclusion>
           <groupId>org.springframework.boot</groupId>
-          <artifactId>spring-boot-starter-web</artifactId>
-          <exclusions>
-            <exclusion>
-              <groupId>org.springframework.boot</groupId>
-              <artifactId>spring-boot-starter-tomcat</artifactId>
-            </exclusion>
-          </exclusions>
-        </dependency>     
+          <artifactId>spring-boot-starter-tomcat</artifactId>
+        </exclusion>
+      </exclusions>
+    </dependency>     
     <dependency>
       <groupId>de.codecentric</groupId>
       <artifactId>spring-boot-admin-starter-client</artifactId>
@@ -100,10 +100,10 @@
       <groupId>org.apache.commons</groupId>
       <artifactId>commons-collections4</artifactId>
     </dependency>
-   <dependency>
-        <groupId>org.hibernate.validator</groupId>
-        <artifactId>hibernate-validator</artifactId>
-    </dependency>    
+    <dependency>
+      <groupId>org.hibernate.validator</groupId>
+      <artifactId>hibernate-validator</artifactId>
+    </dependency>     
 
    <dependency>
       <groupId>org.apache.cxf</groupId>
diff --git a/connector/src/assembly/assembly_dir.xml b/connector/src/assembly/assembly_dir.xml
index 59437be6..bc12a470 100644
--- a/connector/src/assembly/assembly_dir.xml
+++ b/connector/src/assembly/assembly_dir.xml
@@ -44,6 +44,7 @@
         <!-- include>README.md</include-->
         <include>readme_${project.version}.txt</include>
         <include>readme_${project.version}.md</include>
+        <include>history.txt</include>
         <include>eIDAS_Ref_Impl/*</include>
         <include>handbook/*</include>
       </includes>
diff --git a/connector/src/assembly/assembly_zip.xml b/connector/src/assembly/assembly_zip.xml
index 43877283..dcb7dab0 100644
--- a/connector/src/assembly/assembly_zip.xml
+++ b/connector/src/assembly/assembly_zip.xml
@@ -44,6 +44,7 @@
         <!-- include>README.md</include -->
         <include>readme_${project.version}.txt</include>
         <include>readme_${project.version}.md</include>
+        <include>history.txt</include>
         <include>eIDAS_Ref_Impl/*</include>
         <include>handbook/*</include>
       </includes>
diff --git a/connector/src/main/resources/application.properties b/connector/src/main/resources/application.properties
index e7437840..73a258d7 100644
--- a/connector/src/main/resources/application.properties
+++ b/connector/src/main/resources/application.properties
@@ -100,7 +100,7 @@ eidas.ms.auth.eIDAS.szrclient.eidasbind.mds.inject=false
 
 #Raw eIDAS Id data storage
 eidas.ms.auth.eIDAS.szrclient.workarounds.eidmapping.revisionlog.active=true
-
+eidas.ms.auth.eIDAS.szrclient.workarounds.use.getidentitylink.for.ida=true
 
 eidas.ms.auth.eIDAS.szrclient.params.setPlaceOfBirthIfAvailable=true
 eidas.ms.auth.eIDAS.szrclient.params.setBirthNameIfAvailable=true