diff options
author | Thomas Lenz <thomas.lenz@egiz.gv.at> | 2022-02-08 07:50:36 +0000 |
---|---|---|
committer | Thomas Lenz <thomas.lenz@egiz.gv.at> | 2022-02-08 07:50:36 +0000 |
commit | 884f208b5f4152a13e3f77d64ce0d4adec481700 (patch) | |
tree | 220622592c0e49e1bf8ca60d3f16b4881b9b8ce1 /connector/pom.xml | |
parent | a017ebff96d2cc12943801c933e5733b4e827b3b (diff) | |
parent | 07b71d26fb481859548b597aa43d7312608220d9 (diff) | |
download | National_eIDAS_Gateway-884f208b5f4152a13e3f77d64ce0d4adec481700.tar.gz National_eIDAS_Gateway-884f208b5f4152a13e3f77d64ce0d4adec481700.tar.bz2 National_eIDAS_Gateway-884f208b5f4152a13e3f77d64ce0d4adec481700.zip |
Merge branch 'feature/matching_base' into 'feature/matching_search_address'
# Conflicts:
# connector/src/test/java/at/asitplus/eidas/specific/connector/test/saml2/Pvp2SProfileEndPointTest.java
Diffstat (limited to 'connector/pom.xml')
-rw-r--r-- | connector/pom.xml | 73 |
1 files changed, 55 insertions, 18 deletions
diff --git a/connector/pom.xml b/connector/pom.xml index a721930d..dff75c08 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.3-SNAPSHOT</version> + <version>1.2.4-SNAPSHOT</version> </parent> <groupId>at.asitplus.eidas.ms_specific</groupId> @@ -33,6 +33,16 @@ <dependency> <groupId>at.gv.egiz.eaaf</groupId> <artifactId>eaaf_module_pvp2_idp</artifactId> + <exclusions> + <exclusion> + <groupId>org.bouncycastle</groupId> + <artifactId>bcpkix-jdk15on</artifactId> + </exclusion> + <exclusion> + <groupId>org.bouncycastle</groupId> + <artifactId>bcprov-jdk15on</artifactId> + </exclusion> + </exclusions> </dependency> <dependency> <groupId>at.asitplus.eidas.ms_specific</groupId> @@ -88,6 +98,10 @@ <artifactId>slf4j-api</artifactId> </dependency> <dependency> + <groupId>org.apache.logging.log4j</groupId> + <artifactId>log4j-to-slf4j</artifactId> + </dependency> + <dependency> <groupId>org.apache.commons</groupId> <artifactId>commons-collections4</artifactId> </dependency> @@ -96,6 +110,19 @@ <artifactId>hibernate-validator</artifactId> </dependency> + <dependency> + <groupId>org.apache.cxf</groupId> + <artifactId>cxf-core</artifactId> + </dependency> + <dependency> + <groupId>org.apache.cxf</groupId> + <artifactId>cxf-rt-frontend-jaxws</artifactId> + </dependency> + <dependency> + <groupId>org.apache.cxf</groupId> + <artifactId>cxf-rt-transports-http</artifactId> + </dependency> + <!-- Testing --> <dependency> @@ -126,6 +153,18 @@ <type>test-jar</type> </dependency> <dependency> + <groupId>at.gv.egiz.eaaf</groupId> + <artifactId>eaaf_module_pvp2_sp</artifactId> + <scope>test</scope> + </dependency> + <dependency> + <groupId>at.asitplus.eidas.ms_specific.modules</groupId> + <artifactId>authmodule-eIDAS-v2</artifactId> + <classifier>tests</classifier> + <scope>test</scope> + <type>test-jar</type> + </dependency> + <dependency> <groupId>org.springframework.boot</groupId> <artifactId>spring-boot-starter-tomcat</artifactId> <scope>test</scope> @@ -136,29 +175,27 @@ <scope>test</scope> </dependency> <dependency> + <groupId>com.squareup.okhttp3</groupId> + <artifactId>mockwebserver</artifactId> + <scope>test</scope> + </dependency> + + <dependency> <groupId>com.github.skjolber</groupId> <artifactId>mockito-soap-cxf</artifactId> - <scope>test</scope> - <!--exclusions> - <exclusion> - <groupId>org.apache.cxf</groupId> - <artifactId>cxf-rt-wsdl</artifactId> - </exclusion> - <exclusion> - <groupId>org.apache.cxf</groupId> - <artifactId>cxf-rt-bindings-soap</artifactId> - </exclusion> - <exclusion> - <groupId>org.apache.cxf</groupId> - <artifactId>cxf-core</artifactId> - </exclusion> - </exclusions--> + <scope>test</scope> </dependency> + <dependency> - <groupId>com.squareup.okhttp3</groupId> - <artifactId>mockwebserver</artifactId> + <groupId>org.powermock</groupId> + <artifactId>powermock-module-junit4</artifactId> <scope>test</scope> </dependency> + <dependency> + <groupId>org.powermock</groupId> + <artifactId>powermock-api-mockito2</artifactId> + <scope>test</scope> + </dependency> </dependencies> <profiles> |