diff options
| author | Thomas Lenz <tlenz@iaik.tugraz.at> | 2016-01-22 13:52:48 +0100 |
|---|---|---|
| committer | Thomas Lenz <tlenz@iaik.tugraz.at> | 2016-01-22 13:52:48 +0100 |
| commit | 5b0754bddacd5bc7586b56c5a93e78f67d5cb060 (patch) | |
| tree | a318ee77db5ac52afd2fda9412e7bcc7deab362d /id/server/auth/pom.xml | |
| parent | e2ca81976097a5f83183e091ec6a5c9a6afb5269 (diff) | |
| parent | 1672ef1dc32bf37c966660c33e422729addd5b41 (diff) | |
| download | moa-id-spss-5b0754bddacd5bc7586b56c5a93e78f67d5cb060.tar.gz moa-id-spss-5b0754bddacd5bc7586b56c5a93e78f67d5cb060.tar.bz2 moa-id-spss-5b0754bddacd5bc7586b56c5a93e78f67d5cb060.zip | |
Merge branch 'eSense_eIDAS_development' into moa-id-3.2_(OPB)
Conflicts:
id/server/idserverlib/pom.xml
id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/MOAIDAuthInitializer.java
id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/config/auth/AuthConfiguration.java
id/server/modules/module-stork/src/main/java/at/gv/egovernment/moa/id/auth/modules/stork/tasks/CreateStorkAuthRequestFormTask.java
Diffstat (limited to 'id/server/auth/pom.xml')
| -rw-r--r-- | id/server/auth/pom.xml | 18 |
1 files changed, 13 insertions, 5 deletions
diff --git a/id/server/auth/pom.xml b/id/server/auth/pom.xml index 96f51666f..98ec73a25 100644 --- a/id/server/auth/pom.xml +++ b/id/server/auth/pom.xml @@ -132,17 +132,25 @@ </exclusion> </exclusions> </dependency> - <dependency> + + <!-- Adding eIDAS module dependency automatically adds eIDAS protocol capabilities. --> + <dependency> + <groupId>MOA.id.server.modules</groupId> + <artifactId>moa-id-module-eIDAS</artifactId> + </dependency> + + +<!-- <dependency> <groupId>eu.stork</groupId> <artifactId>oasis-dss-api</artifactId> <version>1.0.0-RELEASE</version> - </dependency> + </dependency> --> - <!-- Adding stork module dependency automatically adds stork capabilities. --> - <dependency> + <!-- Adding stork module dependency automatically adds stork capabilities. --> +<!-- <dependency> <groupId>MOA.id.server.modules</groupId> <artifactId>moa-id-module-stork</artifactId> - </dependency> + </dependency> --> <!-- Adding monitoring module dependency automatically adds monitoring capabilities. --> <dependency> |