diff options
author | Thomas <> | 2022-01-10 17:51:02 +0100 |
---|---|---|
committer | Thomas <> | 2022-01-10 17:51:02 +0100 |
commit | 0d9f042b4c88ba5f34da452cd19ada24146d32af (patch) | |
tree | 1370658eae285efdcf1c76c075397540ca8de198 /connector/pom.xml | |
parent | 29868d8000773c74c395891bebb685a3252e13ec (diff) | |
parent | 0f0b59abce4242bdd69de1b48f2d197bc84255ba (diff) | |
download | National_eIDAS_Gateway-0d9f042b4c88ba5f34da452cd19ada24146d32af.tar.gz National_eIDAS_Gateway-0d9f042b4c88ba5f34da452cd19ada24146d32af.tar.bz2 National_eIDAS_Gateway-0d9f042b4c88ba5f34da452cd19ada24146d32af.zip |
Merge branch 'master' into feature/matching_base_rebase
# Conflicts:
# connector/pom.xml
# connector/src/test/java/at/asitplus/eidas/specific/connector/test/task/GenerateCountrySelectionFrameTaskTest.java
# eidas_modules/authmodule-eIDAS-v2/checks/spotbugs-exclude.xml
# eidas_modules/authmodule-eIDAS-v2/pom.xml
# pom.xml
Diffstat (limited to 'connector/pom.xml')
-rw-r--r-- | connector/pom.xml | 59 |
1 files changed, 41 insertions, 18 deletions
diff --git a/connector/pom.xml b/connector/pom.xml index a721930d..f386c08f 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.3</version> </parent> <groupId>at.asitplus.eidas.ms_specific</groupId> @@ -96,6 +96,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 +139,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 +161,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> |