diff options
author | Bojan Suzic <bojan.suzic@iaik.tugraz.at> | 2014-11-03 13:05:12 +0100 |
---|---|---|
committer | Bojan Suzic <bojan.suzic@iaik.tugraz.at> | 2014-11-03 13:05:12 +0100 |
commit | c2819264cface1a6f11cfe692429a0e93804794f (patch) | |
tree | 710858de5e3d9883d36213b041e5baff25d1da29 /id/server/auth | |
parent | 22a66cdf1b5f7916422034f3338e680202ddc31b (diff) | |
parent | 2886006ba2ca141377e66a330df5fc52797c2755 (diff) | |
download | moa-id-spss-c2819264cface1a6f11cfe692429a0e93804794f.tar.gz moa-id-spss-c2819264cface1a6f11cfe692429a0e93804794f.tar.bz2 moa-id-spss-c2819264cface1a6f11cfe692429a0e93804794f.zip |
merging
Diffstat (limited to 'id/server/auth')
-rw-r--r-- | id/server/auth/.gitignore | 2 | ||||
-rw-r--r-- | id/server/auth/pom.xml | 4 | ||||
-rw-r--r-- | id/server/auth/src/main/webapp/index.html | 2 |
3 files changed, 7 insertions, 1 deletions
diff --git a/id/server/auth/.gitignore b/id/server/auth/.gitignore new file mode 100644 index 000000000..4dc009173 --- /dev/null +++ b/id/server/auth/.gitignore @@ -0,0 +1,2 @@ +/target +/bin diff --git a/id/server/auth/pom.xml b/id/server/auth/pom.xml index b43a0e736..dd75ee6aa 100644 --- a/id/server/auth/pom.xml +++ b/id/server/auth/pom.xml @@ -108,6 +108,10 @@ <artifactId>iaik_pki_module</artifactId> <groupId>iaik</groupId> </exclusion> + <exclusion> + <artifactId>axis-wsdl4j</artifactId> + <groupId>axis</groupId> + </exclusion> </exclusions> </dependency> <dependency> diff --git a/id/server/auth/src/main/webapp/index.html b/id/server/auth/src/main/webapp/index.html index 968f211bc..391195def 100644 --- a/id/server/auth/src/main/webapp/index.html +++ b/id/server/auth/src/main/webapp/index.html @@ -14,7 +14,7 @@ </tr>
</table>
<hr/>
- <p class="title">MOA-ID 2.1.1</p>
+ <p class="title">MOA-ID 2.1.2</p>
<hr/>
<h1>Inhalt</h1>
<ol>
|