diff options
| author | Thomas Lenz <tlenz@iaik.tugraz.at> | 2016-05-10 15:50:52 +0200 |
|---|---|---|
| committer | Thomas Lenz <tlenz@iaik.tugraz.at> | 2016-05-10 15:50:52 +0200 |
| commit | aa4f6b8a17400e6ebbe83d92e26b25413deb9aa1 (patch) | |
| tree | 0798f107e13d8a8546c1b15c6432e5360a656e92 /id/server/auth-final | |
| parent | 576f5ea5cfaf2ea174f198dc5df238c1ca0c331a (diff) | |
| parent | c3e07d7fb87b2d132ffc838e4878b9479da361a7 (diff) | |
| download | moa-id-spss-aa4f6b8a17400e6ebbe83d92e26b25413deb9aa1.tar.gz moa-id-spss-aa4f6b8a17400e6ebbe83d92e26b25413deb9aa1.tar.bz2 moa-id-spss-aa4f6b8a17400e6ebbe83d92e26b25413deb9aa1.zip | |
Update to MOA-SPSS 3.0.0-RC1
Merge branch 'moa-id-3.2_(OPB)' into moa-id_with_moa-sig_and_eccelerate
Conflicts:
id/moa-spss-container/pom.xml
pom.xml
Diffstat (limited to 'id/server/auth-final')
| -rw-r--r-- | id/server/auth-final/pom.xml | 22 |
1 files changed, 15 insertions, 7 deletions
diff --git a/id/server/auth-final/pom.xml b/id/server/auth-final/pom.xml index 4f564c00f..b2f542880 100644 --- a/id/server/auth-final/pom.xml +++ b/id/server/auth-final/pom.xml @@ -77,6 +77,7 @@ <dependency> <groupId>MOA.id</groupId> <artifactId>moa-spss-container</artifactId> + <type>pom</type> <exclusions> <exclusion> <groupId>commons-logging</groupId> @@ -86,7 +87,19 @@ <artifactId>axis-wsdl4j</artifactId> <groupId>axis</groupId> </exclusion> - </exclusions> + <exclusion> + <artifactId>axis</artifactId> + <groupId>axis</groupId> + </exclusion> + <exclusion> + <artifactId>axis-jaxrpc</artifactId> + <groupId>org.apache.axis</groupId> + </exclusion> + <exclusion> + <artifactId>axis-saaj</artifactId> + <groupId>org.apache.axis</groupId> + </exclusion> + </exclusions> </dependency> <dependency> @@ -142,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-pvp2</artifactId> - </dependency> --> - <dependency> <groupId>MOA.id.server.modules</groupId> <artifactId>moa-id-modul-citizencard_authentication</artifactId> |