diff options
| author | Alexander Marsalek <amarsalek@iaik.tugraz.at> | 2014-07-07 17:24:33 +0200 |
|---|---|---|
| committer | Alexander Marsalek <amarsalek@iaik.tugraz.at> | 2014-07-07 17:24:33 +0200 |
| commit | 26a2ba4a0c171fb9cdf9ea2c769576b1062480eb (patch) | |
| tree | 81eba1f7a442e7a121c2d1b783b1926a42e2a553 /spss/server/serverws | |
| parent | 8b8ea32ebd30b542a9b4ea1c797078377443f251 (diff) | |
| parent | b6b155c4d55a31a13d189f50831fb7fa8c504b90 (diff) | |
| download | moa-id-spss-26a2ba4a0c171fb9cdf9ea2c769576b1062480eb.tar.gz moa-id-spss-26a2ba4a0c171fb9cdf9ea2c769576b1062480eb.tar.bz2 moa-id-spss-26a2ba4a0c171fb9cdf9ea2c769576b1062480eb.zip | |
Merge branch 'moa-2.1-Snapshot' into authnrequest_signrequest_split
Diffstat (limited to 'spss/server/serverws')
| -rw-r--r-- | spss/server/serverws/.project | 7 | ||||
| -rw-r--r-- | spss/server/serverws/pom.xml | 8 |
2 files changed, 14 insertions, 1 deletions
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> |