diff options
| author | Thomas Lenz <tlenz@iaik.tugraz.at> | 2014-01-23 14:10:24 +0100 |
|---|---|---|
| committer | Thomas Lenz <tlenz@iaik.tugraz.at> | 2014-01-23 14:10:24 +0100 |
| commit | 9eb81a78755db5c9735d2a43ee91fb11ce62e58e (patch) | |
| tree | 91ed5dd8a8dcb9b6ebb43ec32d782a9bff410405 /spss/server | |
| parent | 587971b14627083236df96b8a79f005f92990d75 (diff) | |
| parent | d9550b5e3f24a0f6013502dcc632c4d2730a6749 (diff) | |
| download | moa-id-spss-9eb81a78755db5c9735d2a43ee91fb11ce62e58e.tar.gz moa-id-spss-9eb81a78755db5c9735d2a43ee91fb11ce62e58e.tar.bz2 moa-id-spss-9eb81a78755db5c9735d2a43ee91fb11ce62e58e.zip | |
Merge branch 'moa2_0_tlenz' into moa_2.0_OAuth
Conflicts:
id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/protocols/pvp2x/builder/assertion/PVP2AssertionBuilder.java
id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/protocols/pvp2x/builder/attributes/MandateReferenceValueAttributeBuilder.java
id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/protocols/pvp2x/requestHandler/AuthnRequestHandler.java
id/server/idserverlib/src/main/resources/resources/properties/id_messages_de.properties
Diffstat (limited to 'spss/server')
| -rw-r--r-- | spss/server/tools/pom.xml | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/spss/server/tools/pom.xml b/spss/server/tools/pom.xml index 01e6c67c9..1d20a7b8a 100644 --- a/spss/server/tools/pom.xml +++ b/spss/server/tools/pom.xml @@ -42,7 +42,8 @@ <dependency> <groupId>log4j</groupId> <artifactId>log4j</artifactId> - <scope>compile</scope> + <version>1.2.17</version> + <scope>compile</scope> </dependency> <dependency> <groupId>xalan-bin-dist</groupId> |