diff options
author | Thomas <> | 2022-04-05 11:00:10 +0200 |
---|---|---|
committer | Thomas <> | 2022-04-05 11:00:10 +0200 |
commit | bc9eb2e62c863dae9fc9625cccb18ddfe4ff02d8 (patch) | |
tree | 7f01e64f0ede90908116f52419539d3dd9b96950 /connector/pom.xml | |
parent | 35bdf175478d1412ce39a7ce66f39ea26ead315c (diff) | |
parent | 9d1e1294c2825c6f9a422c9f9c51f9965258d19e (diff) | |
download | National_eIDAS_Gateway-bc9eb2e62c863dae9fc9625cccb18ddfe4ff02d8.tar.gz National_eIDAS_Gateway-bc9eb2e62c863dae9fc9625cccb18ddfe4ff02d8.tar.bz2 National_eIDAS_Gateway-bc9eb2e62c863dae9fc9625cccb18ddfe4ff02d8.zip |
Merge branch 'nightlybuild' into feature/matching_base
# Conflicts:
# connector/pom.xml
# connector/src/test/java/at/asitplus/eidas/specific/connector/test/FullStartUpAndProcessTest.java
# modules/authmodule-eIDAS-v2/src/main/java/at/asitplus/eidas/specific/modules/auth/eidas/v2/clients/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
# pom.xml
Diffstat (limited to 'connector/pom.xml')
-rw-r--r-- | connector/pom.xml | 26 |
1 files changed, 13 insertions, 13 deletions
diff --git a/connector/pom.xml b/connector/pom.xml index d631f766..afbac1da 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.2.4-SNAPSHOT</version> + <version>1.2.5-SNAPSHOT</version> </parent> <groupId>at.asitplus.eidas.ms_specific</groupId> @@ -72,15 +72,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> @@ -109,10 +109,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> |