diff options
| author | Christian Maierhofer <cmaierhofer@iaik.tugraz.at> | 2016-06-29 11:16:35 +0200 |
|---|---|---|
| committer | Christian Maierhofer <cmaierhofer@iaik.tugraz.at> | 2016-06-29 11:16:35 +0200 |
| commit | ad156aaec0e4e8cd97a6eee6aa96e9d5700d0b4f (patch) | |
| tree | 046064b84e29aada56546439db931fe830cd9eb4 /id/server/auth-final/pom.xml | |
| parent | 7717d75918fb63ee7e9d7bf31de2696577b7e991 (diff) | |
| parent | b3aa8b6d444e7dee51e1145e3192b191ae24b1d4 (diff) | |
| download | moa-id-spss-ad156aaec0e4e8cd97a6eee6aa96e9d5700d0b4f.tar.gz moa-id-spss-ad156aaec0e4e8cd97a6eee6aa96e9d5700d0b4f.tar.bz2 moa-id-spss-ad156aaec0e4e8cd97a6eee6aa96e9d5700d0b4f.zip | |
Merge branch 'eIDAS_node_implementation_remote' into moapid-3.2-opb-redis
Conflicts:
id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/servlet/AbstractController.java
id/server/moa-id-commons/src/main/java/at/gv/egovernment/moa/id/commons/db/dao/session/AssertionStore.java
Diffstat (limited to 'id/server/auth-final/pom.xml')
| -rw-r--r-- | id/server/auth-final/pom.xml | 18 |
1 files changed, 5 insertions, 13 deletions
diff --git a/id/server/auth-final/pom.xml b/id/server/auth-final/pom.xml index 61eba7f22..b2f542880 100644 --- a/id/server/auth-final/pom.xml +++ b/id/server/auth-final/pom.xml @@ -77,12 +77,9 @@ <dependency> <groupId>MOA.id</groupId> <artifactId>moa-spss-container</artifactId> + <type>pom</type> <exclusions> <exclusion> - <artifactId>iaik_pki_module</artifactId> - <groupId>iaik</groupId> - </exclusion> - <exclusion> <groupId>commons-logging</groupId> <artifactId>commons-logging</artifactId> </exclusion> @@ -158,16 +155,11 @@ <artifactId>moa-id-module-openID</artifactId> </dependency> - <dependency> + <dependency> <groupId>MOA.id.server.modules</groupId> <artifactId>moa-id-module-elga_mandate_service</artifactId> </dependency> -<!-- <dependency> - <groupId>MOA.id.server.modules</groupId> - <artifactId>moa-id-module-eIDAS</artifactId> - </dependency> --> - <dependency> <groupId>MOA.id.server.modules</groupId> <artifactId>moa-id-modul-citizencard_authentication</artifactId> @@ -191,12 +183,12 @@ <!-- should be in the ext directory of the jre --> <scope>provided</scope> </dependency> - <dependency> +<!-- <dependency> <groupId>iaik.prod</groupId> <artifactId>iaik_ecc</artifactId> - <!-- should be in the ext directory of the jre --> + should be in the ext directory of the jre <scope>provided</scope> - </dependency> + </dependency> --> <dependency> <groupId>iaik.prod</groupId> <artifactId>iaik_Pkcs11Provider</artifactId> |