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/serverws/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/serverws/pom.xml')
| -rw-r--r-- | spss/server/serverws/pom.xml | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/spss/server/serverws/pom.xml b/spss/server/serverws/pom.xml index 9159242ef..79a16cbb5 100644 --- a/spss/server/serverws/pom.xml +++ b/spss/server/serverws/pom.xml @@ -115,7 +115,7 @@ <groupId>log4j</groupId> <artifactId>log4j</artifactId> </dependency> - <dependency> +<!-- <dependency> <groupId>iaik</groupId> <artifactId>iaik_util</artifactId> </dependency> @@ -138,7 +138,7 @@ <dependency> <groupId>iaik</groupId> <artifactId>iaik_jsse</artifactId> - </dependency> + </dependency> --> <!-- transitive dependencies we don't want to include into the war --> <dependency> |