aboutsummaryrefslogtreecommitdiff
path: root/spss/server/serverws
diff options
context:
space:
mode:
authorFlorian Reimair <florian.reimair@iaik.tugraz.at>2015-08-11 15:42:13 +0200
committerFlorian Reimair <florian.reimair@iaik.tugraz.at>2015-08-11 15:42:13 +0200
commitebe02bc990d362e39a37906385d7e470235e2627 (patch)
treeb5513c0ccf37f201810ecea4a7af5c21dec60739 /spss/server/serverws
parent2ec0757b66d9e23c4c29c9ca59c94acd6a9b46c4 (diff)
parent04381eb4e2d67ced539b34747403bb06cdf36c53 (diff)
downloadmoa-id-spss-ebe02bc990d362e39a37906385d7e470235e2627.tar.gz
moa-id-spss-ebe02bc990d362e39a37906385d7e470235e2627.tar.bz2
moa-id-spss-ebe02bc990d362e39a37906385d7e470235e2627.zip
Merge branch 'samlengine_update' into moa-2.1-Snapshot
Diffstat (limited to 'spss/server/serverws')
-rw-r--r--spss/server/serverws/.project42
-rw-r--r--spss/server/serverws/pom.xml4
2 files changed, 4 insertions, 42 deletions
diff --git a/spss/server/serverws/.project b/spss/server/serverws/.project
deleted file mode 100644
index 8150d984e..000000000
--- a/spss/server/serverws/.project
+++ /dev/null
@@ -1,42 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>moa-spss-ws</name>
- <comment></comment>
- <projects>
- </projects>
- <buildSpec>
- <buildCommand>
- <name>org.eclipse.wst.jsdt.core.javascriptValidator</name>
- <arguments>
- </arguments>
- </buildCommand>
- <buildCommand>
- <name>org.eclipse.jdt.core.javabuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- <buildCommand>
- <name>org.eclipse.wst.common.project.facet.core.builder</name>
- <arguments>
- </arguments>
- </buildCommand>
- <buildCommand>
- <name>org.eclipse.wst.validation.validationbuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- <buildCommand>
- <name>org.eclipse.m2e.core.maven2Builder</name>
- <arguments>
- </arguments>
- </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 bbfb3c443..b90026252 100644
--- a/spss/server/serverws/pom.xml
+++ b/spss/server/serverws/pom.xml
@@ -109,6 +109,10 @@
<artifactId>iaik_pki_module</artifactId>
<groupId>iaik</groupId>
</exclusion>
+ <exclusion>
+ <artifactId>iaik_jce_eval_signed</artifactId>
+ <groupId>iaik</groupId>
+ </exclusion>
</exclusions>
</dependency>
<dependency>