diff options
| author | Thomas Lenz <tlenz@iaik.tugraz.at> | 2016-06-07 13:19:13 +0200 |
|---|---|---|
| committer | Thomas Lenz <tlenz@iaik.tugraz.at> | 2016-06-07 13:19:13 +0200 |
| commit | f660735c26170c05396e0feeac53e7dcf3c5b5df (patch) | |
| tree | 2ae4bbc58f060c54150830cacdecb03dddd1123a /id/ConfigWebTool/pom.xml | |
| parent | 81f86fc319e98469cc4ae65f8c4a3c8a4636ac00 (diff) | |
| parent | 0cf75d5ee50f3c285a772ce96411f7bf98fe2a72 (diff) | |
| download | moa-id-spss-f660735c26170c05396e0feeac53e7dcf3c5b5df.tar.gz moa-id-spss-f660735c26170c05396e0feeac53e7dcf3c5b5df.tar.bz2 moa-id-spss-f660735c26170c05396e0feeac53e7dcf3c5b5df.zip | |
Merge remote-tracking branch 'remotes/origin/moapid-3.2-opb-redis' into eIDAS_node_implementation
Conflicts:
id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/protocols/pvp2x/SingleLogOutAction.java
Diffstat (limited to 'id/ConfigWebTool/pom.xml')
| -rw-r--r-- | id/ConfigWebTool/pom.xml | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/id/ConfigWebTool/pom.xml b/id/ConfigWebTool/pom.xml index c672d32a6..28c0a9fe4 100644 --- a/id/ConfigWebTool/pom.xml +++ b/id/ConfigWebTool/pom.xml @@ -64,12 +64,6 @@ <dependency> <groupId>MOA.id.server</groupId> <artifactId>moa-id-commons</artifactId> - <exclusions> - <exclusion> - <artifactId>hibernate-c3p0</artifactId> - <groupId>org.hibernate</groupId> - </exclusion> - </exclusions> </dependency> <dependency> |