diff options
author | Thomas <> | 2022-05-12 12:23:53 +0200 |
---|---|---|
committer | Thomas <> | 2022-05-12 12:23:53 +0200 |
commit | cbcc63885156c0b4039d5e71f943e760faaa5d78 (patch) | |
tree | f26bebf7071e10bf4987114c47148d9b6c4fe88c /connector/pom.xml | |
parent | b3f78f57ff8da8a82af57377eaabea22031582e9 (diff) | |
parent | bcfcee7879f65fe55911b566754b860a2454583a (diff) | |
download | National_eIDAS_Gateway-cbcc63885156c0b4039d5e71f943e760faaa5d78.tar.gz National_eIDAS_Gateway-cbcc63885156c0b4039d5e71f943e760faaa5d78.tar.bz2 National_eIDAS_Gateway-cbcc63885156c0b4039d5e71f943e760faaa5d78.zip |
Merge branch 'feature/matching_base' into nightlybuild_matching
# Conflicts:
# 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/main/java/at/asitplus/eidas/specific/modules/auth/eidas/v2/utils/EidasResponseUtils.java
# modules/authmodule-eIDAS-v2/src/test/java/at/asitplus/eidas/specific/modules/auth/eidas/v2/test/SzrClientTestProduction.java
Diffstat (limited to 'connector/pom.xml')
-rw-r--r-- | connector/pom.xml | 32 |
1 files changed, 18 insertions, 14 deletions
diff --git a/connector/pom.xml b/connector/pom.xml index 9ffc4969..afbac1da 100644 --- a/connector/pom.xml +++ b/connector/pom.xml @@ -57,7 +57,16 @@ <artifactId>authmodule-eIDAS-v2</artifactId> </dependency> - <!-- Third party libs --> + <dependency> + <groupId>at.gv.egiz.eaaf</groupId> + <artifactId>eaaf_module_pvp2_core</artifactId> + </dependency> + <dependency> + <groupId>at.gv.egiz.eaaf</groupId> + <artifactId>eaaf_module_pvp2_sp</artifactId> + </dependency> + + <!-- Third party libs --> <dependency> <groupId>org.springframework.boot</groupId> <artifactId>spring-boot-starter-actuator</artifactId> @@ -134,7 +143,7 @@ <groupId>org.springframework.boot</groupId> <artifactId>spring-boot-starter-test</artifactId> <scope>test</scope> - </dependency> + </dependency> <dependency> <groupId>at.gv.egiz.eaaf</groupId> <artifactId>eaaf_core_utils</artifactId> @@ -146,12 +155,7 @@ <artifactId>eaaf-core</artifactId> <scope>test</scope> <type>test-jar</type> - </dependency> - <dependency> - <groupId>at.gv.egiz.eaaf</groupId> - <artifactId>eaaf_module_pvp2_sp</artifactId> - <scope>test</scope> - </dependency> + </dependency> <dependency> <groupId>at.gv.egiz.eaaf</groupId> <artifactId>eaaf_module_pvp2_sp</artifactId> @@ -180,7 +184,7 @@ <groupId>at.gv.egiz.eaaf</groupId> <artifactId>eaaf-springboot-utils</artifactId> <scope>test</scope> - </dependency> + </dependency> <dependency> <groupId>com.squareup.okhttp3</groupId> <artifactId>mockwebserver</artifactId> @@ -204,7 +208,7 @@ <scope>test</scope> </dependency> </dependencies> - + <profiles> <profile> <id>default</id> @@ -214,7 +218,7 @@ <name>default</name> </property> </activation> - <dependencies> + <dependencies> <dependency> <groupId>javax.servlet</groupId> <artifactId>javax.servlet-api</artifactId> @@ -232,12 +236,12 @@ <dependency> <groupId>at.gv.egiz.eaaf</groupId> <artifactId>eaaf-springboot-utils</artifactId> - </dependency> + </dependency> </dependencies> </profile> - + </profiles> - + <build> <finalName>ms_connector</finalName> |