diff options
| author | Thomas <> | 2022-04-05 10:19:24 +0200 |
|---|---|---|
| committer | Thomas <> | 2022-04-05 10:19:24 +0200 |
| commit | 9e3b78d931d220e1ed5ecbaadcb13df7cbe96e22 (patch) | |
| tree | 617892075b8faad92a3f9af1cedcbe64763854c6 /connector | |
| parent | 95889412fcd40c60072958caffa611c805038b67 (diff) | |
| parent | 9d1e1294c2825c6f9a422c9f9c51f9965258d19e (diff) | |
| download | National_eIDAS_Gateway-9e3b78d931d220e1ed5ecbaadcb13df7cbe96e22.tar.gz National_eIDAS_Gateway-9e3b78d931d220e1ed5ecbaadcb13df7cbe96e22.tar.bz2 National_eIDAS_Gateway-9e3b78d931d220e1ed5ecbaadcb13df7cbe96e22.zip | |
Merge branch 'nightlybuild' into feature/ms_proxy_before_refactoring
Diffstat (limited to 'connector')
| -rw-r--r-- | connector/pom.xml | 26 | ||||
| -rw-r--r-- | connector/src/assembly/assembly_dir.xml | 1 | ||||
| -rw-r--r-- | connector/src/assembly/assembly_zip.xml | 1 | ||||
| -rw-r--r-- | connector/src/main/resources/application.properties | 2 |
4 files changed, 16 insertions, 14 deletions
diff --git a/connector/pom.xml b/connector/pom.xml index 87a22702..f494ea94 100644 --- a/connector/pom.xml +++ b/connector/pom.xml @@ -6,7 +6,7 @@ <parent> <groupId>at.asitplus.eidas</groupId> <artifactId>ms_specific</artifactId> - <version>1.3.0-SNAPSHOT</version> + <version>1.2.5-SNAPSHOT</version> </parent> <groupId>at.asitplus.eidas.ms_specific</groupId> @@ -75,15 +75,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> @@ -112,10 +112,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 74e86aed..01ee5320 100644 --- a/connector/src/main/resources/application.properties +++ b/connector/src/main/resources/application.properties @@ -125,7 +125,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 |