diff options
| author | Thomas Lenz <tlenz@iaik.tugraz.at> | 2014-09-15 13:42:36 +0200 |
|---|---|---|
| committer | Thomas Lenz <tlenz@iaik.tugraz.at> | 2014-09-15 13:42:36 +0200 |
| commit | 8074865580b5fa28817b37c9ad2e8c992ebef977 (patch) | |
| tree | 475cd1ed9bc517dffbf023e7d9c7d16ce2bde8c5 /spss/server/serverlib/pom.xml | |
| parent | 234f17d14f9f48655c27d54114df0aa2593cf6d8 (diff) | |
| parent | 714a8cb32dd5585829dfc1926e56971425a2a692 (diff) | |
| download | moa-id-spss-8074865580b5fa28817b37c9ad2e8c992ebef977.tar.gz moa-id-spss-8074865580b5fa28817b37c9ad2e8c992ebef977.tar.bz2 moa-id-spss-8074865580b5fa28817b37c9ad2e8c992ebef977.zip | |
Merge branch 'moa-2.1-Snapshot'
Conflicts:
id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/data/oa/OATargetConfiguration.java
pom.xml
Diffstat (limited to 'spss/server/serverlib/pom.xml')
| -rw-r--r-- | spss/server/serverlib/pom.xml | 23 |
1 files changed, 19 insertions, 4 deletions
diff --git a/spss/server/serverlib/pom.xml b/spss/server/serverlib/pom.xml index f762ecdf6..3cf8d0bd7 100644 --- a/spss/server/serverlib/pom.xml +++ b/spss/server/serverlib/pom.xml @@ -58,7 +58,7 @@ <artifactId>log4j</artifactId>
</dependency>
<dependency>
- <groupId>postgresql</groupId>
+ <groupId>org.postgresql</groupId>
<artifactId>postgresql</artifactId>
</dependency>
<dependency>
@@ -144,9 +144,24 @@ <dependency>
<groupId>iaik</groupId>
- <artifactId>iaik_tsl</artifactId>
+ <artifactId>iaik_tsl</artifactId>
+ <exclusions>
+ <exclusion>
+ <artifactId>iaik_pki_module</artifactId>
+ <groupId>iaik</groupId>
+ </exclusion>
+ <exclusion>
+ <artifactId>iaik_ecc_signed</artifactId>
+ <groupId>iaik</groupId>
+ </exclusion>
+ <exclusion>
+ <artifactId>iaik_jce_eval_signed</artifactId>
+ <groupId>iaik</groupId>
+ </exclusion>
+ </exclusions>
</dependency>
- <dependency>
+
+<!-- <dependency>
<groupId>iaik</groupId>
<artifactId>iaik_util</artifactId>
</dependency>
@@ -169,7 +184,7 @@ <dependency>
<groupId>iaik</groupId>
<artifactId>iaik_jsse</artifactId>
- </dependency>
+ </dependency> -->
|