diff options
author | Alexander Marsalek <amarsalek@iaik.tugraz.at> | 2014-09-04 13:35:57 +0200 |
---|---|---|
committer | Alexander Marsalek <amarsalek@iaik.tugraz.at> | 2014-09-04 13:35:57 +0200 |
commit | c9685e638ee5de0d049c8f58fd91848c2dc8a0ba (patch) | |
tree | 110bcbb0463868a39eba0880336ff32cc545034e /spss/server/serverws | |
parent | 33b76e7bb23d8772b3a2533aadd0c3313af4b29f (diff) | |
parent | c109c1e86a228bd3b3ed49b97e182b3cd2136d00 (diff) | |
download | moa-id-spss-c9685e638ee5de0d049c8f58fd91848c2dc8a0ba.tar.gz moa-id-spss-c9685e638ee5de0d049c8f58fd91848c2dc8a0ba.tar.bz2 moa-id-spss-c9685e638ee5de0d049c8f58fd91848c2dc8a0ba.zip |
Merge branch 'merge' into moa-2.1-Snapshot
Diffstat (limited to 'spss/server/serverws')
-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> |