diff options
| author | Thomas Lenz <thomas.lenz@egiz.gv.at> | 2020-02-17 08:10:16 +0100 |
|---|---|---|
| committer | Thomas Lenz <thomas.lenz@egiz.gv.at> | 2020-02-17 08:10:16 +0100 |
| commit | b8b5d79f36c0d51a10dc820b09833179442b5155 (patch) | |
| tree | 7f4ff3c66c8b57b919cd83a4fc8a0247e9c7c0ab /pom.xml | |
| parent | 8fd4b91b8da067055133b2feb97e726c6a834c78 (diff) | |
| parent | c4e1a45e7958cab402d83f6f4ae208df1bb2ab58 (diff) | |
| download | EAAF-Components-b8b5d79f36c0d51a10dc820b09833179442b5155.tar.gz EAAF-Components-b8b5d79f36c0d51a10dc820b09833179442b5155.tar.bz2 EAAF-Components-b8b5d79f36c0d51a10dc820b09833179442b5155.zip | |
Merge branch 'feature/hsmfacade' into nightlyBuild
# Conflicts:
# eaaf_modules/eaaf_module_pvp2_core/src/main/java/at/gv/egiz/eaaf/modules/pvp2/impl/metadata/AbstractChainingMetadataProvider.java
# eaaf_modules/eaaf_module_pvp2_idp/src/test/resources/spring/test_eaaf_core.beans.xml
Diffstat (limited to 'pom.xml')
| -rw-r--r-- | pom.xml | 18 |
1 files changed, 16 insertions, 2 deletions
@@ -43,13 +43,14 @@ <iaik.prod.iaik_xades.version>2.13_moa</iaik.prod.iaik_xades.version> <iaik.prod.iaik_xsect.version>2.13_moa</iaik.prod.iaik_xsect.version> + <hsm-facade-provider.version>0.1.1-SNAPSHOT</hsm-facade-provider.version> <!-- Other third-party libs --> <org.springframework.version>5.1.5.RELEASE</org.springframework.version> <org.opensaml.version>3.4.3</org.opensaml.version> <org.apache.santuario.xmlsec.version>2.1.4</org.apache.santuario.xmlsec.version> <org.bouncycastle.bcprov-jdk15on.version>1.64</org.bouncycastle.bcprov-jdk15on.version> - + <org.slf4j.version>1.7.25</org.slf4j.version> <commons-codec.version>1.11</commons-codec.version> <org.apache.commons-lang3.version>3.8.1</org.apache.commons-lang3.version> @@ -103,6 +104,13 @@ </activation> <repositories> <repository> + <id>asit</id> + <url>https://dev.a-sit.at/repositories/snapshot</url> + <snapshots> + <enabled>true</enabled> + </snapshots> + </repository> + <repository> <id>egiz-commons</id> <url>https://apps.egiz.gv.at/maven/</url> <releases> @@ -308,6 +316,12 @@ </dependency> <dependency> + <groupId>at.asitplus.hsmfacade</groupId> + <artifactId>provider</artifactId> + <version>${hsm-facade-provider.version}</version> + </dependency> + + <dependency> <groupId>javax.annotation</groupId> <artifactId>javax.annotation-api</artifactId> <version>${javax.annotation-api}</version> @@ -483,7 +497,7 @@ <version>${egiz.eaaf.version}</version> <scope>test</scope> <type>test-jar</type> - </dependency> + </dependency> </dependencies> </dependencyManagement> <dependencies> |