diff options
| author | Alexander Marsalek <amarsalek@iaik.tugraz.at> | 2014-07-08 10:55:12 +0200 |
|---|---|---|
| committer | Alexander Marsalek <amarsalek@iaik.tugraz.at> | 2014-07-08 10:55:12 +0200 |
| commit | 487db6041f9c215e7d6cb93ed1d5b93ebb607ee3 (patch) | |
| tree | c9302a52902d025c48105a87c9f43d5c2793bf92 /pom.xml | |
| parent | 9d07e7a6dcd66c0ebff241e4f0113b787fcbcffb (diff) | |
| parent | 49daddb4b7296311aa68fc717dfcb35005e16b3e (diff) | |
| download | moa-id-spss-487db6041f9c215e7d6cb93ed1d5b93ebb607ee3.tar.gz moa-id-spss-487db6041f9c215e7d6cb93ed1d5b93ebb607ee3.tar.bz2 moa-id-spss-487db6041f9c215e7d6cb93ed1d5b93ebb607ee3.zip | |
Merge branch 'moa-2.1-Snapshot' into authnrequest_signrequest_split
Conflicts:
id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/stork/STORKResponseProcessor.java
id/server/moa-id-commons/src/main/resources/config/moaid_config_2.0.xsd
Diffstat (limited to 'pom.xml')
| -rw-r--r-- | pom.xml | 4 |
1 files changed, 2 insertions, 2 deletions
@@ -12,10 +12,10 @@ <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<moa-commons-version>2.0.0</moa-commons-version>
- <moa-id-version>2.1.0</moa-id-version>
+ <moa-id-version>2.1.1-Snapshot</moa-id-version>
<moa-id-proxy-version>2.0.0</moa-id-proxy-version>
<moa-spss-version>2.0.1</moa-spss-version>
- <configtool-version>1.1.0</configtool-version>
+ <configtool-version>1.1.1-Snapshot</configtool-version>
<demo-oa-version>2.0.2</demo-oa-version>
</properties>
|