aboutsummaryrefslogtreecommitdiff
path: root/id
diff options
context:
space:
mode:
authorThomas Lenz <tlenz@iaik.tugraz.at>2017-03-16 11:43:54 +0100
committerThomas Lenz <tlenz@iaik.tugraz.at>2017-03-16 11:43:54 +0100
commit3474af93a3436a334a1e7e903e6f6dcc5fdb774c (patch)
tree964241ebbffcce696356c661a2f40c8045fb54f0 /id
parentb60b2ed4ddae5f7b67f4d08af281a8fef2661f7a (diff)
parentd69ba86f0855097e46e525794075f3c743e7facb (diff)
downloadmoa-id-spss-3474af93a3436a334a1e7e903e6f6dcc5fdb774c.tar.gz
moa-id-spss-3474af93a3436a334a1e7e903e6f6dcc5fdb774c.tar.bz2
moa-id-spss-3474af93a3436a334a1e7e903e6f6dcc5fdb774c.zip
Merge branch 'Branch_MOA-ID-3.2.1' into eIDAS_node_implementation
# Conflicts: # id/server/moa-id-commons/pom.xml # id/server/modules/moa-id-module-eIDAS/src/main/java/at/gv/egovernment/moa/id/protocols/eidas/attributes/builder/IeIDASAttribute.java # id/server/modules/moa-id-module-eIDAS/src/main/java/at/gv/egovernment/moa/id/protocols/eidas/attributes/builder/eIDASAttrDateOfBirth.java # id/server/modules/moa-id-module-eIDAS/src/main/java/at/gv/egovernment/moa/id/protocols/eidas/attributes/builder/eIDASAttrLegalName.java # id/server/modules/moa-id-module-eIDAS/src/main/java/at/gv/egovernment/moa/id/protocols/eidas/attributes/builder/eIDASAttrLegalPersonIdentifier.java # pom.xml
Diffstat (limited to 'id')
-rw-r--r--id/moa-id-webgui/pom.xml1
1 files changed, 0 insertions, 1 deletions
diff --git a/id/moa-id-webgui/pom.xml b/id/moa-id-webgui/pom.xml
index 31247efc1..a3b3675ef 100644
--- a/id/moa-id-webgui/pom.xml
+++ b/id/moa-id-webgui/pom.xml
@@ -29,7 +29,6 @@
<plugins>
<plugin>
<artifactId>maven-compiler-plugin</artifactId>
- <version>3.1</version>
<configuration>
<source>1.7</source>
<target>1.7</target>