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/server/auth-final | |
| 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/server/auth-final')
| -rw-r--r-- | id/server/auth-final/pom.xml | 70 |
1 files changed, 28 insertions, 42 deletions
diff --git a/id/server/auth-final/pom.xml b/id/server/auth-final/pom.xml index 504adb486..c957f6cd8 100644 --- a/id/server/auth-final/pom.xml +++ b/id/server/auth-final/pom.xml @@ -2,7 +2,7 @@ <parent> <groupId>MOA.id</groupId> <artifactId>moa-id</artifactId> - <version>3.x</version> + <version>4.1.0</version> </parent> <modelVersion>4.0.0</modelVersion> @@ -21,7 +21,7 @@ <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> </repositories> @@ -130,61 +130,47 @@ <artifactId>moa-id-frontend-resources</artifactId> </dependency> - - <!-- Adding eIDAS module dependency automatically adds eIDAS protocol capabilities. --> - <!--dependency> - <groupId>MOA.id.server.modules</groupId> - <artifactId>moa-id-module-eIDAS</artifactId> - </dependency--> - - <!-- Adding monitoring module dependency automatically adds monitoring capabilities. --> <dependency> <groupId>MOA.id.server.modules</groupId> <artifactId>moa-id-module-monitoring</artifactId> </dependency> - <dependency> <groupId>MOA.id.server.modules</groupId> <artifactId>moa-id-module-saml1</artifactId> </dependency> - <dependency> - <groupId>MOA.id.server.modules</groupId> - <artifactId>moa-id-module-openID</artifactId> - </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-openID</artifactId> + </dependency> - <dependency> - <groupId>MOA.id.server.modules</groupId> - <artifactId>moa-id-modul-citizencard_authentication</artifactId> - </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-sl20_authentication</artifactId> - </dependency> + <dependency> + <groupId>MOA.id.server.modules</groupId> + <artifactId>moa-id-modul-citizencard_authentication</artifactId> + </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>MOA.id.server.modules</groupId> + <artifactId>moa-id-module-AT_eIDAS_connector</artifactId> + </dependency> + + <dependency> + <groupId>MOA.id.server.modules</groupId> + <artifactId>moa-id-module-EID_connector</artifactId> + </dependency> - <!--dependency> - <groupId>MOA.id.server.modules</groupId> - <artifactId>moa-id-modules-federated_authentication</artifactId> - </dependency--> - - <!--dependency> - <groupId>MOA.id.server.modules</groupId> - <artifactId>moa-id-module-ssoTransfer</artifactId> - <version>${moa-id-version}</version> - </dependency--> <!-- transitive dependencies we don't want to include into the war --> <dependency> |