diff options
| author | Thomas Lenz <tlenz@iaik.tugraz.at> | 2019-12-13 10:13:05 +0100 |
|---|---|---|
| committer | Thomas Lenz <tlenz@iaik.tugraz.at> | 2019-12-13 10:13:05 +0100 |
| commit | 6fc2e600055d4737ce94d8a012eb3764bd7e93c8 (patch) | |
| tree | 56aebaaac2c87458ebfd798a2c66f95718e1dd4e /id/oa/pom.xml | |
| parent | de2e45024694c7eb5e033bc6b1bcb90f5f499b07 (diff) | |
| parent | bea0d19650b5fbbb48fcda0f39ef3a93d6cf6f1f (diff) | |
| download | moa-id-spss-6fc2e600055d4737ce94d8a012eb3764bd7e93c8.tar.gz moa-id-spss-6fc2e600055d4737ce94d8a012eb3764bd7e93c8.tar.bz2 moa-id-spss-6fc2e600055d4737ce94d8a012eb3764bd7e93c8.zip | |
Merge branch 'current_development' into development_preview
# Conflicts:
# id/history.txt
# id/server/modules/moa-id-modul-citizencard_authentication/src/main/java/at/gv/egovernment/moa/id/auth/AuthenticationServer.java
# pom.xml
Diffstat (limited to 'id/oa/pom.xml')
| -rw-r--r-- | id/oa/pom.xml | 19 |
1 files changed, 16 insertions, 3 deletions
diff --git a/id/oa/pom.xml b/id/oa/pom.xml index 07b84ed1b..29a37f2c4 100644 --- a/id/oa/pom.xml +++ b/id/oa/pom.xml @@ -4,7 +4,7 @@ <parent> <groupId>MOA</groupId> <artifactId>id</artifactId> - <version>3.x</version> + <version>4.1.0</version> </parent> <modelVersion>4.0.0</modelVersion> @@ -22,12 +22,12 @@ <repository> <id>shibboleth.internet2.edu</id> <name>Internet2</name> - <url>https://build.shibboleth.net/nexus/content/groups/public/</url> + <url>https://apps.egiz.gv.at/shibboleth_nexus/</url> </repository> <repository> <id>IAIK Local</id> <name>iaik/libs</name> - <url>http://nexus.iaik.tugraz.at/nexus/content/repositories/iaik/</url> + <url>https://apps.egiz.gv.at/maven/</url> </repository> </repositories> @@ -139,6 +139,19 @@ </exclusions> </dependency> + <dependency> + <groupId>org.bouncycastle</groupId> + <artifactId>bcpkix-jdk15on</artifactId> + <version>1.62</version> + <scope>test</scope> + </dependency> + + <dependency> + <groupId>org.bouncycastle</groupId> + <artifactId>bcprov-jdk15on</artifactId> + <version>1.62</version> + </dependency> + </dependencies> </project> |