diff options
| author | Thomas Lenz <tlenz@iaik.tugraz.at> | 2018-07-16 18:34:17 +0200 |
|---|---|---|
| committer | Thomas Lenz <tlenz@iaik.tugraz.at> | 2018-07-16 18:34:17 +0200 |
| commit | 43b57a3c903669fc9de36c46e99773bac97a2102 (patch) | |
| tree | 1e5cd74c040f79709d0265acb134bb50085848e3 /id/server/auth-edu/pom.xml | |
| parent | 05d5c29bb3be38d40484f9c5bb5fdbdc131cba9f (diff) | |
| parent | 4ae32fabc822b3c8ed51d380969f7db682d1bfae (diff) | |
| download | moa-id-spss-43b57a3c903669fc9de36c46e99773bac97a2102.tar.gz moa-id-spss-43b57a3c903669fc9de36c46e99773bac97a2102.tar.bz2 moa-id-spss-43b57a3c903669fc9de36c46e99773bac97a2102.zip | |
Merge branch 'huge_refactoring' into development_preview
# Conflicts:
# id/server/doc/handbook/config/config.html
# id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/config/auth/OAAuthParameterDecorator.java
# id/server/modules/moa-id-modul-citizencard_authentication/src/main/java/at/gv/egovernment/moa/id/auth/AuthenticationServer.java
# id/server/modules/moa-id-modul-citizencard_authentication/src/main/java/at/gv/egovernment/moa/id/auth/modules/internal/tasks/VerifyAuthenticationBlockTask.java
# id/server/modules/moa-id-modul-citizencard_authentication/src/main/java/at/gv/egovernment/moa/id/auth/validator/CreateXMLSignatureResponseValidator.java
Diffstat (limited to 'id/server/auth-edu/pom.xml')
| -rw-r--r-- | id/server/auth-edu/pom.xml | 33 |
1 files changed, 21 insertions, 12 deletions
diff --git a/id/server/auth-edu/pom.xml b/id/server/auth-edu/pom.xml index 3c400a635..a1901177e 100644 --- a/id/server/auth-edu/pom.xml +++ b/id/server/auth-edu/pom.xml @@ -206,11 +206,20 @@ <dependency> <groupId>MOA.id.server.modules</groupId> <artifactId>moa-id-module-bkaMobilaAuthSAML2Test</artifactId> - <version>${moa-id-version}</version> </dependency> - - -<!-- <dependency> + + <dependency> + <groupId>MOA.id.server.modules</groupId> + <artifactId>moa-id-module-sl20_authentication</artifactId> + </dependency> + + <dependency> + <groupId>MOA.id.server.modules</groupId> + <artifactId>moa-id-module-AT_eIDAS_connector</artifactId> + </dependency> + +<!-- + <dependency> <groupId>org.apache.santuario</groupId> <artifactId>xmlsec</artifactId> </dependency> --> @@ -240,18 +249,18 @@ <!-- should be in the ext directory of the jre --> <!-- <scope>provided</scope> --> </dependency> - <dependency> +<!-- <dependency> <groupId>xalan-bin-dist</groupId> <artifactId>xalan</artifactId> - <!-- should be provided by the container or jre --> - <!-- <scope>provided</scope> --> + should be provided by the container or jre + <scope>provided</scope> <exclusions> <exclusion> <groupId>xalan</groupId> <artifactId>serializer</artifactId> </exclusion> </exclusions> - </dependency> + </dependency> --> <dependency> <groupId>xerces</groupId> <artifactId>xercesImpl</artifactId> @@ -264,12 +273,12 @@ <!-- should be provided by the container or jre --> <!-- <scope>provided</scope> --> </dependency> - <dependency> +<!-- <dependency> <groupId>xalan-bin-dist</groupId> <artifactId>serializer</artifactId> - <!-- should be provided by the container or jre --> - <!-- <scope>provided</scope> --> - </dependency> + should be provided by the container or jre + <scope>provided</scope> + </dependency> --> <dependency> <groupId>org.springframework</groupId> |