aboutsummaryrefslogtreecommitdiff
path: root/spss/server
diff options
context:
space:
mode:
authorKlaus Stranacher <kstranacher@iaik.tugraz.at>2014-06-25 15:29:40 +0200
committerKlaus Stranacher <kstranacher@iaik.tugraz.at>2014-06-25 15:29:40 +0200
commitf57b189815b6f26710071fe18bf858fdff4a63d1 (patch)
tree06fe8e351f9482807da9191d2acbdbc0c2a0dfbb /spss/server
parent8f3f0922e06cc0fdd9f2d7562061a15570435e12 (diff)
downloadmoa-id-spss-f57b189815b6f26710071fe18bf858fdff4a63d1.tar.gz
moa-id-spss-f57b189815b6f26710071fe18bf858fdff4a63d1.tar.bz2
moa-id-spss-f57b189815b6f26710071fe18bf858fdff4a63d1.zip
Exclude iaik_pki_module (from TSL library)
Diffstat (limited to 'spss/server')
-rw-r--r--spss/server/serverlib/pom.xml2
-rw-r--r--spss/server/serverws/.project7
-rw-r--r--spss/server/serverws/pom.xml8
3 files changed, 15 insertions, 2 deletions
diff --git a/spss/server/serverlib/pom.xml b/spss/server/serverlib/pom.xml
index 3c29cd88c..f762ecdf6 100644
--- a/spss/server/serverlib/pom.xml
+++ b/spss/server/serverlib/pom.xml
@@ -144,7 +144,7 @@
<dependency>
<groupId>iaik</groupId>
- <artifactId>iaik_tsl</artifactId>
+ <artifactId>iaik_tsl</artifactId>
</dependency>
<dependency>
<groupId>iaik</groupId>
diff --git a/spss/server/serverws/.project b/spss/server/serverws/.project
index 4faa086c3..8150d984e 100644
--- a/spss/server/serverws/.project
+++ b/spss/server/serverws/.project
@@ -6,6 +6,11 @@
</projects>
<buildSpec>
<buildCommand>
+ <name>org.eclipse.wst.jsdt.core.javascriptValidator</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ <buildCommand>
<name>org.eclipse.jdt.core.javabuilder</name>
<arguments>
</arguments>
@@ -27,9 +32,11 @@
</buildCommand>
</buildSpec>
<natures>
+ <nature>org.eclipse.jem.workbench.JavaEMFNature</nature>
<nature>org.eclipse.jdt.core.javanature</nature>
<nature>org.eclipse.m2e.core.maven2Nature</nature>
<nature>org.eclipse.wst.common.project.facet.core.nature</nature>
<nature>org.eclipse.wst.common.modulecore.ModuleCoreNature</nature>
+ <nature>org.eclipse.wst.jsdt.core.jsNature</nature>
</natures>
</projectDescription>
diff --git a/spss/server/serverws/pom.xml b/spss/server/serverws/pom.xml
index 56168a586..9159242ef 100644
--- a/spss/server/serverws/pom.xml
+++ b/spss/server/serverws/pom.xml
@@ -91,7 +91,7 @@
<dependency>
<groupId>MOA.spss.server</groupId>
<artifactId>moa-spss-lib</artifactId>
- <!--version>${pom.version}</version-->
+ <!--version>${pom.version}</version-->
</dependency>
<dependency>
<groupId>MOA</groupId>
@@ -104,6 +104,12 @@
<dependency>
<groupId>iaik</groupId>
<artifactId>iaik_tsl</artifactId>
+ <exclusions>
+ <exclusion>
+ <artifactId>iaik_pki_module</artifactId>
+ <groupId>iaik</groupId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>log4j</groupId>