Merge branch 'current_development' into development_preview

# Conflicts:
#	id/history.txt
#	id/server/modules/moa-id-modul-citizencard_authentication/src/main/java/at/gv/egovernment/moa/id/auth/AuthenticationServer.java
#	pom.xml

1 files changed, 893 insertions, 849 deletions

diff --git a/pom.xml b/pom.xml
index 630a30c05..f5bfb5746 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1,855 +1,899 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-    <modelVersion>4.0.0</modelVersion>
-    <groupId>MOA</groupId>
-    <artifactId>MOA</artifactId>
-    <packaging>pom</packaging>
-    <version>2.x</version>
-    <name>MOA</name>
-
-    <properties>
-        <repositoryPath>${basedir}/repository</repositoryPath>
-        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-		
-			<!-- Project Version -->			
-			<moa-id-version>3.4.5</moa-id-version>
-			
-			<moa-id-version-final>3.4.5</moa-id-version-final>			
-			<moa-id-version-edu>3.4.5</moa-id-version-edu>			
-			
-			<moa-id-proxy-version>2.0.1</moa-id-proxy-version>
-			
-			<configtool-version>2.5.4</configtool-version>
-			<demo-oa-version>2.0.6</demo-oa-version>
-			
-			<moa-id-module-elga_mandate_client>1.3.2</moa-id-module-elga_mandate_client>
-
-			<!-- =================================================================================== -->
-			<egiz.eaaf.version>1.0.6.1</egiz.eaaf.version>							
-			<org.springframework.version>5.1.5.RELEASE</org.springframework.version>
-			<org.springframework.data.spring-data-jpa>2.1.5.RELEASE</org.springframework.data.spring-data-jpa>
-			<org.springframework.data.spring-data-redis>2.1.5.RELEASE</org.springframework.data.spring-data-redis>
-			<surefire.version>2.22.0</surefire.version>		
-			
-			<jaxb.version>2.3.0</jaxb.version>
-			<guava.version>27.0-jre</guava.version>
-			
-			<opensaml.version>2.6.6</opensaml.version> <!-- update to v3 (v2 is end-of-life in june 2016)-->
-			<xmltooling.version>1.4.6</xmltooling.version>
-			<xmlsec.version>2.1.2</xmlsec.version>
-			
-			<hibernate.version>5.3.6.Final</hibernate.version>
-			<org.apache.commons.commons.dbcp2>2.5.0</org.apache.commons.commons.dbcp2> 
-						
-			<cxf.version>3.2.6</cxf.version>			
-			<struts.version>2.5.20</struts.version> <!-- 2.5.10.1 -->
-			
-			<egovutils.version>2.0.0</egovutils.version>
-			
-			<slf4j.version>1.7.25</slf4j.version>						
-			
-			<httpclient.version>4.5.6</httpclient.version>
-			<httpcore.version>4.4.10</httpcore.version>
-			
-			<!-- Maybe problems with Hibernate 5.0.10 -->
-			<mysql-connector.java>8.0.12</mysql-connector.java>
-			<!-- <mysql-connector.java>5.1.40</mysql-connector.java> -->			
-						
-			<junit.version>4.12</junit.version>			
-			<org.apache.commons.io.version>2.6</org.apache.commons.io.version>
-			<org.apache.commons.lang3.version>3.7</org.apache.commons.lang3.version>
-			<org.apache.commons.collections4.version>4.1</org.apache.commons.collections4.version>
-			<org.apache.commons.collections3.version>3.2.2</org.apache.commons.collections3.version>
-			<jodatime.version>2.10</jodatime.version>
-			
-			<jackson-version>2.9.7</jackson-version>
-	    	<apache-cli-version>1.4</apache-cli-version>
-	    	<spring-orm-version>${org.springframework.version}</spring-orm-version>
-	   
-    </properties>
-
-    <profiles>
-        <profile>
-            <id>default</id>
-            <activation>
-                <activeByDefault>true</activeByDefault>
-                <property>
-                    <name>default</name>
-                </property>
-            </activation>
-            <modules>
-                <module>id</module>              
-            </modules>
-            <repositories>
-                <repository>
-                    <id>local</id>
-                    <name>local</name>
-                    <url>file:${basedir}/../../../repository</url>
-                </repository>
-<!--                 <repository>
-                    <id>hyberjaxb</id>
-                    <url>http://repository.highsource.org/maven2/releases/</url>
-                    <releases>
-                        <enabled>false</enabled>
-                    </releases>
-                </repository> -->
-                <repository>
-                    <id>jboss</id>
-                    <url>https://repository.jboss.org/nexus/content/repositories/central/</url>
-                    <releases>
-                        <enabled>true</enabled>
-                    </releases>
-                </repository>
-                <repository>
-                    <id>egiz-commons</id>
-                    <url>http://demo.egiz.gv.at/int-repo/</url>
-                    <releases>
-                        <enabled>true</enabled>
-                    </releases>
-                </repository>
-                
-            </repositories>
-        </profile>
-    </profiles>
-    
-    <build>
-    	<pluginManagement>
-    		<plugins>
-    			<plugin>
-    				<artifactId>maven-release-plugin</artifactId>
-    				<version>2.5.1</version>
-    			</plugin>
-    		</plugins>
-    	</pluginManagement>
-        <plugins>
-<!--         		<plugin>
-            		<groupId>org.codehaus.mojo</groupId>
-            		<artifactId>properties-maven-plugin</artifactId>
-            		<version>1.0-alpha-2</version>
-            		<executions>
-                		<execution>
-                    		<phase>initialize</phase>
-                    		<goals>
-                        		<goal>read-project-properties</goal>
-                    		</goals>
-                    		<configuration>
-    	                   		<files>
-		                            <file>${basedir}/moa-id.properties</file>
-      		                  </files>
-          		          </configuration>
-              		  </execution>
-            		</executions>
-        		</plugin> -->
-        		<plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-surefire-plugin</artifactId>
-                <version>${surefire.version}</version>
-                <configuration>
-                	<excludes>
-                		<exclude>eu/stork/peps/test/simple/SimpleBaseTest.java</exclude>
-                		<exclude>eu/stork/peps/test/simple/StorkAttrQueryRequestTest.java</exclude>
-                		<exclude>eu/stork/peps/test/simple/StorkAttrQueryResponseTest.java</exclude>
-                		<exclude>eu/stork/peps/test/simple/StorkAuthRequestTest.java</exclude>
-                		<exclude>eu/stork/peps/test/simple/StorkLogoutRequestTest.java</exclude>
-                		<exclude>eu/stork/peps/test/simple/StorkLogoutResponseTest.java</exclude>
-                		<exclude>eu/stork/peps/test/simple/StorkNewResponseTest.java</exclude>
-                		<exclude>eu/stork/peps/test/simple/StorkResponseTest.java</exclude>
-                		<exclude>test/MOAIDTestCase.java</exclude>
-                		<exclude>test/at/gv/egovernment/moa/MOATestCase.java</exclude>
-                		<exclude>test/at/gv/egovernment/moa/id/UnitTestCase.java</exclude>
-                		<exclude>test/at/gv/egovernment/moa/id/auth/MOAIDAuthInitialiserTest.java</exclude>
-                		<exclude>test/at/gv/egovernment/moa/id/auth/builder/GetIdentityLinkFormBuilderTest.java</exclude>
-                		<exclude>test/at/gv/egovernment/moa/id/auth/builder/InfoboxReadRequestBuilderTest.java</exclude>
-                		<exclude>test/at/gv/egovernment/moa/id/auth/builder/PersonDataBuilderTest.java</exclude>
-                		<exclude>test/at/gv/egovernment/moa/id/auth/builder/SAMLArtifactBuilderTest.java</exclude>
-                		<exclude>test/at/gv/egovernment/moa/id/auth/builder/VerifyXMLSignatureRequestBuilderTest.java</exclude>
-                		<exclude>test/at/gv/egovernment/moa/id/auth/invoke/IdentityLinkAssertionParserTest.java</exclude>
-                		<exclude>test/at/gv/egovernment/moa/id/auth/invoke/MOASPSSTestCase.java</exclude>
-                		<exclude>test/at/gv/egovernment/moa/id/auth/invoke/SignatureVerificationTest.java</exclude>
-                		<exclude>test/at/gv/egovernment/moa/id/auth/oauth/CertTest.java</exclude>
-                		<exclude>test/at/gv/egovernment/moa/id/auth/parser/IdentityLinkAssertionParserTest.java</exclude>
-                		<exclude>test/at/gv/egovernment/moa/id/auth/parser/InfoboxReadResponseParserTest.java</exclude>
-                		<exclude>test/at/gv/egovernment/moa/id/auth/parser/SAMLArtifactParserTest.java</exclude>
-                		<exclude>test/at/gv/egovernment/moa/id/proxy/builder/SAMLArtifactBuilderTest.java</exclude>
-                		<exclude>test/at/gv/egovernment/moa/id/proxy/builder/SAMLRequestBuilderTest.java</exclude>
-                		<exclude>test/at/gv/egovernment/moa/id/proxy/parser/SAMLResponseParserTest.java</exclude>
-                		<exclude>test/at/gv/egovernment/moa/spss/SPSSTestCase.java</exclude>
-                		<exclude>test/at/gv/egovernment/moa/spss/api/xmlbind/CreateXMLSignatureRequestParserTest.java</exclude>
-                		<exclude>test/at/gv/egovernment/moa/spss/api/xmlbind/TransformParserTest.java</exclude>
-                		<exclude>test/at/gv/egovernment/moa/spss/api/xmlbind/VerifyCMSSignatureRequestParserTest.java</exclude>
-                		<exclude>test/at/gv/egovernment/moa/spss/api/xmlbind/VerifyXMLSignatureRequestParserTest.java</exclude>
-                		<exclude>test/at/gv/egovernment/moa/spss/server/iaik/config/ConfigurationDataImplTest.java</exclude>
-                		<exclude>test/at/gv/egovernment/moa/spss/server/iaik/config/IaikConfiguratorTest.java</exclude>
-                		<exclude>test/at/gv/egovernment/moa/spss/server/invoke/CMSSignatureVerificationInvokerTest.java</exclude>
-                		<exclude>test/at/gv/egovernment/moa/spss/server/invoke/DataObjectFactoryTest.java</exclude>
-                		<exclude>test/at/gv/egovernment/moa/spss/server/invoke/TransformationFactoryTest.java</exclude>
-                		<exclude>test/at/gv/egovernment/moa/spss/server/invoke/XMLSignatureCreationInvokerTest.java</exclude>
-                		<exclude>test/at/gv/egovernment/moa/spss/server/invoke/XMLSignatureVerificationInvokerTest.java</exclude>
-                		<exclude>test/at/gv/egovernment/moa/spss/server/tools/CertToolTest.java</exclude>
-                		<exclude>test/at/gv/egovernment/moa/util/DOMUtilsTest.java</exclude>
-                		<exclude>test/at/gv/egovernment/moa/util/KeyStoreUtilsTest.java</exclude>
-                		<exclude>test/at/gv/egovernment/moa/util/SSLUtilsTest.java</exclude>
-                		<exclude>test/at/gv/egovernment/moa/util/URLDecoderTest.java</exclude>
-                		<exclude>test/at/gv/egovernment/moa/util/URLEncoderTest.java</exclude>
-                		<exclude>test/at/gv/egovernment/moa/util/XMLGrammarBuilderTest.java</exclude>
-                		<exclude>test/at/gv/egovernment/moa/util/XPathUtilsTest.java</exclude>
-                	</excludes>
-                </configuration>
-            </plugin>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-compiler-plugin</artifactId>
-                <version>3.6.1</version>
-                <configuration>
-                    <verbose>false</verbose>
-                    <fork>true</fork>
-                    <executable>${env.BUILD_EXECUTEABLE}</executable>
-                    <compilerVersion>${env.BUILD_VERSION}</compilerVersion>
-                    <encoding>${project.build.sourceEncoding}</encoding>
-                    <source>1.8</source>
-                    <target>1.8</target>
-                </configuration>
-            </plugin>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-jar-plugin</artifactId>
-                <configuration>
-                    <archive>
-                        <manifest>
-                            <addDefaultImplementationEntries>true</addDefaultImplementationEntries>
-                        </manifest>
-                    </archive>
-                </configuration>
-            </plugin>
-            <plugin>
-                <inherited>false</inherited>
-                <artifactId>maven-assembly-plugin</artifactId>
-                <!-- <version>2.2-beta-1</version> --> 
-                <version>2.2.2</version>
-                <!-- TODO Update Version 2.2-beta-1 for MOA-SPSS -->
-                <configuration>
-                    <finalName>moa</finalName>
-                    <encoding>UTF-8</encoding>
-                    <descriptors>
-                        <descriptor>id/assembly-auth-final.xml</descriptor>
-                        <descriptor>id/assembly-auth-edu.xml</descriptor>
-                        <descriptor>id/assembly-proxy.xml</descriptor>   
-                                              
-<!--                         <descriptor>spss/assembly.xml</descriptor>
-                        <descriptor>spss/assembly-lib.xml</descriptor> -->
-                    </descriptors>
-                </configuration>
-            </plugin>
-            
-            		            <!-- Vulnerability checks -->
-<!--             <plugin>
-              <groupId>org.owasp</groupId>
-              <artifactId>dependency-check-maven</artifactId>
-              <version>1.2.5</version>
-              <executions>
-                  <execution>
-                  	<phase>verify</phase>
-                    <goals>
-                    	<goal>check</goal>
-                    </goals>
-                  </execution>
-              </executions>
-            </plugin> -->
-            
-        </plugins>
-        
-    </build>
-
-    <reporting>
-        <plugins>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-javadoc-plugin</artifactId>
-                <configuration>
-                    <excludePackageNames>test.*</excludePackageNames>
-                    <failOnError>false</failOnError>
-                </configuration>
-            </plugin>
-        </plugins>
-    </reporting>
-
-    <dependencyManagement>
-        <dependencies>
-
-					<dependency>
-						<groupId>org.apache.commons</groupId>
-						<artifactId>commons-dbcp2</artifactId>
-						<version>${org.apache.commons.commons.dbcp2}</version>
-					</dependency>
-			<dependency>
-  				<groupId>org.opensaml</groupId>
-  				<artifactId>opensaml</artifactId>
-  				<version>${opensaml.version}</version>
-  			</dependency>  		
-			<dependency>
-				<groupId>org.opensaml</groupId>
-				<artifactId>xmltooling</artifactId>
-				<version>${xmltooling.version}</version>
-			</dependency>
-			<dependency>
-				<groupId>org.apache.santuario</groupId>
-				<artifactId>xmlsec</artifactId>
-				<version>${xmlsec.version}</version>
-			</dependency>
-
-		<dependency>
-			<groupId>com.google.guava</groupId>
-			<artifactId>guava</artifactId>
-			<version>${guava.version}</version>
-		</dependency>
-
-    	<dependency>
-        	<groupId>org.apache.cxf</groupId>
-        	<artifactId>cxf-rt-frontend-jaxws</artifactId>
-        	<version>${cxf.version}</version>
-    	</dependency>
-    	<dependency>
-        	<groupId>org.apache.cxf</groupId>
-        	<artifactId>cxf-rt-transports-http</artifactId>
-        	<version>${cxf.version}</version>
-    	</dependency>
-
-				<dependency>
-					<groupId>commons-collections</groupId>
-					<artifactId>commons-collections</artifactId>
-					<version>${org.apache.commons.collections3.version}</version>
-				</dependency>
-
-        <dependency>
-            <groupId>org.apache.struts</groupId>
-            <artifactId>struts2-core</artifactId>
-            <version>${struts.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.struts</groupId>
-            <artifactId>struts2-json-plugin</artifactId>
-            <version>${struts.version}</version>
-        </dependency>
-
-        <dependency>
-            <groupId>at.gv.util</groupId>
-            <artifactId>egovutils</artifactId>
-            <version>${egovutils.version}</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.slf4j</groupId>
-            <artifactId>slf4j-api</artifactId>
-            <version>${slf4j.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.slf4j</groupId>
-            <artifactId>jcl-over-slf4j</artifactId>
-            <version>${slf4j.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.slf4j</groupId>
-            <artifactId>jul-to-slf4j</artifactId>
-            <version>${slf4j.version}</version>
-        </dependency>
-        <dependency>
-						<groupId>org.slf4j</groupId>
-						<artifactId>slf4j-log4j12</artifactId>
-						<version>${slf4j.version}</version>
-				</dependency>
-		 
-            <dependency>
-                <groupId>jaxen</groupId>
-                <artifactId>jaxen</artifactId>
-                <version>1.1.6</version>
-            </dependency>
-            <dependency>
-                <groupId>saxpath</groupId>
-                <artifactId>saxpath</artifactId>
-                <version>1.0-FCS</version>
-                <scope>compile</scope> 
-            </dependency>
-
- 						<dependency>
-							<groupId>org.apache.logging.log4j</groupId>
-							<artifactId>log4j-core</artifactId>
-							<version>2.5</version>
-						</dependency>            					
-            					
-    				<dependency>
-    					<groupId>org.apache.httpcomponents</groupId>
-    					<artifactId>httpclient</artifactId>
-    					<version>${httpclient.version}</version>
-						</dependency>            					
-            
-            <dependency>
-    						<groupId>org.apache.httpcomponents</groupId>
-    						<artifactId>httpcore</artifactId>
-    						<version>${httpcore.version}</version>
-						</dependency>
-            
-						<dependency>
-							<groupId>org.postgresql</groupId>
-							<artifactId>postgresql</artifactId>
-							<version>9.3-1102-jdbc41</version>
-						</dependency>
-
-            <dependency>
-                <groupId>javax.mail</groupId>
-                <artifactId>mail</artifactId>
-                <version>1.4.7</version>
-            </dependency>
-            <dependency>
-                <groupId>commons-fileupload</groupId>
-                <artifactId>commons-fileupload</artifactId>
-                <version>1.3.3</version>
-            </dependency>
-            <dependency>
-               <groupId>commons-httpclient</groupId>
-               <artifactId>commons-httpclient</artifactId>
-               <version>3.1</version>
-            </dependency>           
-            <dependency>
-                <groupId>dav4j</groupId>
-                <artifactId>dav4j</artifactId>
-                <version>0.1</version>
-                <scope>compile</scope>
-            </dependency>
-            <dependency>
-                <groupId>httpsclient</groupId>
-                <artifactId>httpsclient</artifactId>
-                <version>JSSE-1.0</version>
-                <scope>compile</scope>
-            </dependency>
-<!--              <dependency>
-                <groupId>regexp</groupId>
-                <artifactId>regexp</artifactId>
-                <version>1.3</version>
-            </dependency> -->
-
-
-<!-- 						<dependency>
-							<groupId>org.bouncycastle</groupId>
-							<artifactId>bcprov-jdk16</artifactId>
-							<version>1.46</version>
-						</dependency> -->
-
-
-						<dependency>
-	    					<groupId>at.gv.egiz.eaaf</groupId>
-	  						<artifactId>eaaf-core</artifactId>
-	  						<version>${egiz.eaaf.version}</version>
-	  					</dependency>
-	  					<dependency>
-							<groupId>at.gv.egiz.eaaf</groupId>
-  							<artifactId>eaaf-core</artifactId>
-  							<type>test-jar</type>
-  							<version>${egiz.eaaf.version}</version>
-  							<scope>test</scope>
-						</dependency>
-	  					<dependency>
-	  						<groupId>at.gv.egiz.eaaf</groupId>
-  							<artifactId>eaaf_module_pvp2_idp</artifactId>
-  							<version>${egiz.eaaf.version}</version>
-  						</dependency>
-  						<dependency> 
-							<groupId>at.gv.egiz.eaaf</groupId>
-  							<artifactId>eaaf_module_pvp2_sp</artifactId>
-  							<version>${egiz.eaaf.version}</version>
-						</dependency>  							
-						<dependency>
-        					<groupId>at.gv.egiz.eaaf</groupId>
-        					<artifactId>eaaf_module_pvp2_core</artifactId>
-        					<version>${egiz.eaaf.version}</version>
-        				</dependency>
-        				<!-- dependency>
-        					<groupId>at.gv.egiz.eaaf</groupId>
-	  						<artifactId>eaaf_module_auth_sl20</artifactId>
-	  						<version>${egiz.eaaf.version}</version>
-        				</dependency-->  							
-  							
-  							
-      					<dependency>
-							<groupId>MOA.id.server</groupId>
-							<artifactId>moa-id-spring-initializer</artifactId>
-							<version>${moa-id-version}</version>
-						</dependency>
-
-						<dependency>
-							<groupId>MOA.id.server</groupId>
-  						<artifactId>moa-id-frontend-resources</artifactId>
-  						<version>${moa-id-version}</version>
-						</dependency>
-
-						<dependency>
-							<groupId>MOA.id</groupId>
-							<artifactId>moa-spss-container</artifactId>
-  						<version>${moa-id-version}</version>
-  						<type>pom</type>
-						</dependency>
-						
-						
-						
-            <dependency>
-                <groupId>MOA.id.server</groupId>
-                <artifactId>moa-id-lib</artifactId>
-                <version>${moa-id-version}</version>
-                <scope>compile</scope>
-            </dependency>
-            <dependency>
-            	<groupId>MOA.id.server</groupId>
-            	<artifactId>moa-id-commons</artifactId>
-            	<version>${moa-id-version}</version>
-              <scope>compile</scope>
-        		</dependency>
-        		
-        		<dependency>
-    					<groupId>MOA.id.server</groupId>
-    					<artifactId>moa-id-jaxb_classes</artifactId>
-    					<version>${moa-id-version}</version>
-    				</dependency>
-        		
-        		<dependency>
-  						<groupId>MOA.id.server</groupId>
-  						<artifactId>moa-id-lib</artifactId>
-  						<version>${moa-id-version}</version>
-  						<scope>test</scope>
-  						<type>test-jar</type>
-  					</dependency>
-               		
-			<dependency>
-				<groupId>MOA.id.server.modules</groupId>
-				<artifactId>moa-id-module-stork</artifactId>
-				<version>${moa-id-version}</version>
-			</dependency>            
-			<dependency>
-				<groupId>MOA.id.server.modules</groupId>
-				<artifactId>moa-id-module-monitoring</artifactId>
-				<version>${moa-id-version}</version>
-			</dependency>
-			<dependency>
-				<groupId>MOA.id.server.modules</groupId>
-				<artifactId>moa-id-module-saml1</artifactId>
-				<version>${moa-id-version}</version>
-			</dependency>
-			<dependency>
-				<groupId>MOA.id.server.modules</groupId>
-				<artifactId>moa-id-module-openID</artifactId>
-				<version>${moa-id-version}</version>
-			</dependency>
-			<dependency>
-				<groupId>MOA.id.server.modules</groupId>
-				<artifactId>moa-id-modul-citizencard_authentication</artifactId>
-				<version>${moa-id-version}</version>
-			</dependency>
-			<dependency>
-				<groupId>MOA.id.server.modules</groupId>
-				<artifactId>moa-id-module-eIDAS</artifactId>
-				<version>${moa-id-version}</version>
-			</dependency>
-			<dependency>
-				<groupId>MOA.id.server.modules</groupId>
-				<artifactId>moa-id-module-pvp2</artifactId>
-				<version>${moa-id-version}</version>
-			</dependency> 
-			<dependency>
-				<groupId>MOA.id.server.modules</groupId>
-				<artifactId>moa-id-modules-federated_authentication</artifactId>
-				<version>${moa-id-version}</version>
-			</dependency> 
-
-			<dependency>
-				<groupId>MOA.id.server.modules</groupId>
-    		<artifactId>moa-id-module-elga_mandate_service</artifactId>
-    		<version>${moa-id-module-elga_mandate_client}</version>
-			</dependency>
-			   			                         
-             <dependency>
-				<groupId>MOA.id.server.modules</groupId>
-				<artifactId>moa-id-module-bkaMobilaAuthSAML2Test</artifactId>
-				<version>${moa-id-version}</version>
-			</dependency>	
-			   			                         
-             <dependency>
-				<groupId>MOA.id.server.modules</groupId>
-				<artifactId>moa-id-module-sl20_authentication</artifactId>
-				<version>${moa-id-version}</version>
-			</dependency>
-			
-			<dependency>
-				<groupId>MOA.id.server.modules</groupId>
-				<artifactId>moa-id-module-AT_eIDAS_connector</artifactId>
-				<version>${moa-id-version}</version>
-			</dependency>				   			                         
-			   			                         
-             <dependency>
-                <groupId>MOA.id.server</groupId>
-                <artifactId>moa-id-commons</artifactId>
-                <version>${moa-id-version}</version>
-                <type>test-jar</type>
-                <scope>test</scope>
-            </dependency>
-             
-            <dependency>
-                <groupId>junit</groupId>
-                <artifactId>junit</artifactId>
-                <version>${junit.version}</version>
-                <scope>test</scope>
-            </dependency>
-            <dependency>
-                <groupId>commons-logging</groupId>
-                <artifactId>commons-logging</artifactId>
-                <version>1.2</version>
-                <scope>compile</scope>
-            </dependency>
-            
-            <dependency>
-            	<groupId>javax.servlet</groupId>
-							<artifactId>javax.servlet-api</artifactId>
-							<version>3.0.1</version> 
-						<scope>provide</scope>                
-            </dependency>
-             <dependency>
-                <groupId>javax.activation</groupId>
-                <artifactId>activation</artifactId>
-                <version>1.1.1</version>	
-                <scope>compile</scope>
-            </dependency>
-            <dependency>
-                <groupId>commons-discovery</groupId>
-                <artifactId>commons-discovery</artifactId>
-                <version>0.5</version>	
-                <scope>compile</scope>
-            </dependency>
-            <!-- IAIK libraries -->
-            <dependency>
-                <groupId>iaik.prod</groupId>
-                <artifactId>iaik_jce_full</artifactId>
-                <version>5.52_moa</version>
-            </dependency>
-            
-            <dependency>
-                <groupId>iaik.prod</groupId>
-                <artifactId>iaik_X509TrustManager</artifactId>
-                <version>0.3.1</version>
-                <scope>compile</scope>
-            </dependency>
-            <dependency>
-                <groupId>iaik.prod</groupId>
-                <artifactId>iaik_Pkcs11Provider</artifactId>
-                <version>1.2.4</version>
-                <scope>runtime</scope>
-            </dependency>
-            <dependency>
-                <groupId>iaik.prod</groupId>
-                <artifactId>iaik_Pkcs11Wrapper</artifactId>
-                <version>1.2.17</version>
-                <scope>compile</scope>
-            </dependency>
-            <dependency>
-                <groupId>iaik.prod</groupId>
-                <artifactId>iaik_Pkcs11Wrapper</artifactId>
-                <version>1.2.17</version>
-                <classifier>win32</classifier>
-                <type>dll</type>
-                <scope>runtime</scope>
-            </dependency>
-            <dependency>
-                <groupId>iaik.prod</groupId>
-                <artifactId>iaik_Pkcs11Wrapper</artifactId>
-                <version>1.2.17</version>
-                <classifier>linux</classifier>
-                <type>so</type>
-                <scope>runtime</scope>
-            </dependency>
-            <dependency>
-                <groupId>iaik.prod</groupId>
-                <artifactId>iaik_Pkcs11Wrapper</artifactId>
-                <version>1.2.17</version>
-                <classifier>linux_x64</classifier>
-                <type>so</type>
-                <scope>runtime</scope>
-            </dependency>
-            <dependency>
-                <groupId>iaik.prod</groupId>
-                <artifactId>iaik_Pkcs11Wrapper</artifactId>
-                <version>1.2.17</version>
-                <classifier>solaris_sparc</classifier>
-                <type>so</type>
-                <scope>runtime</scope>
-            </dependency>
-            <dependency>
-                <groupId>iaik.prod</groupId>
-                <artifactId>iaik_Pkcs11Wrapper</artifactId>
-                <version>1.2.17</version>
-                <classifier>solaris_sparcv9</classifier>
-                <type>so</type>
-                <scope>runtime</scope>
-            </dependency>
-            <dependency>
-                <groupId>iaik.prod</groupId>
-                <artifactId>iaik_Pkcs11Wrapper</artifactId>
-                <version>1.2.17</version>
-                 <classifier>win64</classifier>
-                <type>dll</type>
-                <scope>runtime</scope>
-            </dependency>
-
-		<dependency>
-			<groupId>javax.xml.bind</groupId>
-    		<artifactId>jaxb-api</artifactId>
-    		<version>${jaxb.version}</version>
-		</dependency>
-            		
-            <dependency>
-                <groupId>xerces</groupId>
-                <artifactId>xercesImpl</artifactId>
-                <version>2.11.0</version>
-                <scope>compile</scope>	
-            </dependency>
-            <!-- The xmlParserAPIs.jar of the official xalan distribution
-                 and the one in the central repository differ. So, we
-                 are going to include the official one in our own
-                 distribution to prevent from problems with different
-                 versions in the endorsed directory of the servlet container
-                 or jre endorsed directory. -->
-            <dependency>
-                <groupId>xalan-bin-dist</groupId>
-                <artifactId>xml-apis</artifactId>
-                <version>2.11.0</version>
-                <scope>runtime</scope>
-            </dependency>
-            <!-- The xalan.jar of the official xalan distribution
-                 and the one in the central repository differ. So, we
-                 are going to include the official one in our own
-                 distribution to prevent from problems with different
-                 versions in the endorsed directory of the servlet container
-                 or jre endorsed directory. -->
-            <dependency>
-                <groupId>xalan-bin-dist</groupId>
-                <artifactId>xalan</artifactId>
-                <version>2.7.1</version>
-                <scope>compile</scope><!-- for XPathAPI, Javadoc,...-->
-            </dependency>
-            <dependency>
-                <groupId>xalan-bin-dist</groupId>
-                <artifactId>serializer</artifactId>
-                <version>2.7.1</version><!-- xalan version -->
-                <scope>runtime</scope>
-            </dependency>
-            
-			<dependency>
-				<groupId>org.springframework</groupId>
-				<artifactId>spring-webmvc</artifactId>
-				<version>${org.springframework.version}</version>
-			</dependency>
-			
-			<dependency>
-	        	<groupId>org.springframework.data</groupId>
-	        	<artifactId>spring-data-redis</artifactId>
-	        	<version>${org.springframework.data.spring-data-redis}</version>
-	    	</dependency>
-			
-			
-            <!-- the core, which includes Streaming API, shared low-level abstractions (but NOT data-binding) -->
-            <dependency>
-                <groupId>com.fasterxml.jackson.core</groupId>
-                <artifactId>jackson-core</artifactId>
-                <version>${jackson-version}</version>
-			</dependency>
-			<!-- databinding; ObjectMapper, JsonNode and related classes are here -->
-			<dependency>
-                <groupId>com.fasterxml.jackson.core</groupId>
-                <artifactId>jackson-databind</artifactId>
-                <version>${jackson-version}</version>
-            </dependency>
-            <dependency>
-                <groupId>com.fasterxml.jackson.core</groupId>
-                <artifactId>jackson-annotations</artifactId>
-                <version>${jackson-version}</version>
-            </dependency>
-			<dependency>
-				<groupId>commons-cli</groupId>
-				<artifactId>commons-cli</artifactId>
-				<version>${apache-cli-version}</version>
-			</dependency>
-			
-
-			<dependency>
-				<groupId>org.easymock</groupId>
-				<artifactId>easymock</artifactId>
-				<scope>test</scope>
-				<version>3.5</version>
-			</dependency>
-			<dependency>
-				<groupId>org.unitils</groupId>
-				<artifactId>unitils-core</artifactId>
-				<version>3.4.6</version>
-			</dependency>
-			
-			</dependencies>
-    </dependencyManagement>
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+  xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+  <modelVersion>4.0.0</modelVersion>
+  <groupId>MOA</groupId>
+  <artifactId>MOA</artifactId>
+  <packaging>pom</packaging>
+  <version>4.1.0</version>
+  <name>MOA</name>
 
-    <dependencies>
-        <dependency>
-            <groupId>iaik.prod</groupId>
-            <artifactId>iaik_Pkcs11Wrapper</artifactId>
-            <classifier>win32</classifier>
-            <type>dll</type>
-            <scope>runtime</scope>
-        </dependency>
-        <dependency>
-            <groupId>iaik.prod</groupId>
-            <artifactId>iaik_Pkcs11Wrapper</artifactId>
-            <classifier>linux</classifier>
-            <type>so</type>
-            <scope>runtime</scope>
-        </dependency>
-        <dependency>
-            <groupId>iaik.prod</groupId>
-            <artifactId>iaik_Pkcs11Wrapper</artifactId>
-            <classifier>linux_x64</classifier>
-            <type>so</type>
-            <scope>runtime</scope>
-        </dependency>
-        <dependency>
-            <groupId>iaik.prod</groupId>
-            <artifactId>iaik_Pkcs11Wrapper</artifactId>
-            <classifier>solaris_sparc</classifier>
-            <type>so</type>
-            <scope>runtime</scope>
-        </dependency>
-        <dependency>
-            <groupId>iaik.prod</groupId>
-            <artifactId>iaik_Pkcs11Wrapper</artifactId>
-            <classifier>solaris_sparcv9</classifier>
-            <type>so</type>
-            <scope>runtime</scope>
-        </dependency>
-        <dependency>
-            <groupId>iaik.prod</groupId>
-            <artifactId>iaik_Pkcs11Wrapper</artifactId>
-            <classifier>win64</classifier>
-            <type>dll</type>
-            <scope>runtime</scope>
-        </dependency>
-        <dependency>
-            <groupId>commons-io</groupId>
-            <artifactId>commons-io</artifactId>
-            <version>${org.apache.commons.io.version}</version>
-        </dependency>
+  <properties>
+    <repositoryPath>${basedir}/repository</repositoryPath>
+    <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 
-    </dependencies>
+    <!-- Project Version -->
+    <moa-id-version>4.1.0</moa-id-version>
+
+    <moa-id-version-final>4.1.0</moa-id-version-final>
+    <moa-id-version-edu>4.1.0</moa-id-version-edu>
+
+    <moa-id-proxy-version>2.0.1</moa-id-proxy-version>
+
+    <configtool-version>3.0.1</configtool-version>
+    <demo-oa-version>2.0.6</demo-oa-version>
+
+    <moa-id-module-elga_mandate_client>1.3.2</moa-id-module-elga_mandate_client>
+
+    <!-- =================================================================================== -->
+    <egiz-spring-api.version>0.3</egiz-spring-api.version>
+    <egiz.eaaf.version>1.0.13.2</egiz.eaaf.version>
+    <org.springframework.version>5.2.2.RELEASE</org.springframework.version>
+    <org.springframework.data.spring-data-jpa>2.2.3.RELEASE</org.springframework.data.spring-data-jpa>
+    <org.springframework.data.spring-data-redis>2.2.3.RELEASE</org.springframework.data.spring-data-redis>
+    <surefire.version>2.22.0</surefire.version>
+
+    <jaxb.version>2.3.1</jaxb.version>
+    <jaxb-core.version>2.3.0.1</jaxb-core.version>
+    <guava.version>28.1-jre</guava.version>
+
+    <opensaml.version>2.6.6</opensaml.version> <!-- update to v3 (v2 is end-of-life in june 2016) -->
+    <org.opensaml.openws.version>1.5.6</org.opensaml.openws.version>
+    <xmltooling.version>1.4.6</xmltooling.version>
+    <xmlsec.version>2.1.3</xmlsec.version>
+    <jaxws-api.version>2.3.1</jaxws-api.version>
+    <jws-api.version>1.1</jws-api.version>
+
+    <hibernate.version>5.4.3.Final</hibernate.version>
+    <org.apache.commons.commons.dbcp2>2.6.0</org.apache.commons.commons.dbcp2>
+
+    <cxf.version>3.3.4</cxf.version>
+    <struts.version>2.5.22</struts.version> <!-- 2.5.10.1 -->
 
-    <repositories>
+    <egovutils.version>2.0.0</egovutils.version>
+
+    <slf4j.version>1.7.26</slf4j.version>
+
+    <httpclient.version>4.5.8</httpclient.version>
+    <httpcore.version>4.4.11</httpcore.version>
+
+    <!-- Maybe problems with Hibernate 5.0.10 -->
+    <mysql-connector.java>8.0.16</mysql-connector.java>
+    <!-- <mysql-connector.java>5.1.40</mysql-connector.java> -->
+
+    <junit.version>4.12</junit.version>
+    <org.apache.commons.io.version>2.6</org.apache.commons.io.version>
+    <org.apache.commons.lang3.version>3.9</org.apache.commons.lang3.version>
+    <org.apache.commons.collections4.version>4.3</org.apache.commons.collections4.version>
+    <org.apache.commons.collections3.version>3.2.2</org.apache.commons.collections3.version>
+    <org.apache.commons-text.version>1.6</org.apache.commons-text.version>
+    <jodatime.version>2.10.2</jodatime.version>
+
+    <jackson-version>2.9.9</jackson-version>
+    <apache-cli-version>1.4</apache-cli-version>
+    <spring-orm-version>${org.springframework.version}</spring-orm-version>
+
+  </properties>
+
+  <profiles>
+    <profile>
+      <id>default</id>
+      <activation>
+        <activeByDefault>true</activeByDefault>
+        <property>
+          <name>default</name>
+        </property>
+      </activation>
+      <modules>
+        <module>id</module>
+      </modules>
+      <repositories>
+        <repository>
+          <id>moaid_local</id>
+          <name>local</name>
+          <url>file:${basedir}/../../../repository</url>
+        </repository>
+        <!-- <repository> <id>hyberjaxb</id> <url>http://repository.highsource.org/maven2/releases/</url> 
+          <releases> <enabled>false</enabled> </releases> </repository> -->
+        <repository>
+          <id>egiz-shibboleth-mirror</id>
+          <name>egiz-shibboleth-mirror</name>
+          <url>https://apps.egiz.gv.at/shibboleth_nexus/</url>
+        </repository>
         <repository>
-            <id>MOA</id>
-            <name>MOA Dependencies</name>
-            <!--releases>
-                <enabled>false</enabled>
-                </releases-->
-            <layout>default</layout>
-            <url>file://${repositoryPath}</url>
+          <id>jboss</id>
+          <url>https://repository.jboss.org/nexus/content/repositories/central/</url>
+          <releases>
+            <enabled>true</enabled>
+          </releases>
         </repository>
-    </repositories>
+        <repository>
+          <id>egiz-commons</id>
+          <url>https://apps.egiz.gv.at/maven/</url>
+          <releases>
+            <enabled>true</enabled>
+          </releases>
+        </repository>
+
+      </repositories>
+    </profile>
+  </profiles>
+
+  <build>
+    <pluginManagement>
+      <plugins>
+        <plugin>
+          <artifactId>maven-release-plugin</artifactId>
+          <version>2.5.1</version>
+        </plugin>
+      </plugins>
+    </pluginManagement>
+    <plugins>
+      <!-- <plugin> <groupId>org.codehaus.mojo</groupId> <artifactId>properties-maven-plugin</artifactId> 
+        <version>1.0-alpha-2</version> <executions> <execution> <phase>initialize</phase> 
+        <goals> <goal>read-project-properties</goal> </goals> <configuration> <files> 
+        <file>${basedir}/moa-id.properties</file> </files> </configuration> </execution> 
+        </executions> </plugin> -->
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-surefire-plugin</artifactId>
+        <version>${surefire.version}</version>
+        <configuration>
+          <excludes>
+            <exclude>eu/stork/peps/test/simple/SimpleBaseTest.java</exclude>
+            <exclude>eu/stork/peps/test/simple/StorkAttrQueryRequestTest.java</exclude>
+            <exclude>eu/stork/peps/test/simple/StorkAttrQueryResponseTest.java</exclude>
+            <exclude>eu/stork/peps/test/simple/StorkAuthRequestTest.java</exclude>
+            <exclude>eu/stork/peps/test/simple/StorkLogoutRequestTest.java</exclude>
+            <exclude>eu/stork/peps/test/simple/StorkLogoutResponseTest.java</exclude>
+            <exclude>eu/stork/peps/test/simple/StorkNewResponseTest.java</exclude>
+            <exclude>eu/stork/peps/test/simple/StorkResponseTest.java</exclude>
+            <exclude>test/MOAIDTestCase.java</exclude>
+            <exclude>test/at/gv/egovernment/moa/MOATestCase.java</exclude>
+            <exclude>test/at/gv/egovernment/moa/id/UnitTestCase.java</exclude>
+            <exclude>test/at/gv/egovernment/moa/id/auth/MOAIDAuthInitialiserTest.java</exclude>
+            <exclude>test/at/gv/egovernment/moa/id/auth/builder/GetIdentityLinkFormBuilderTest.java</exclude>
+            <exclude>test/at/gv/egovernment/moa/id/auth/builder/InfoboxReadRequestBuilderTest.java</exclude>
+            <exclude>test/at/gv/egovernment/moa/id/auth/builder/PersonDataBuilderTest.java</exclude>
+            <exclude>test/at/gv/egovernment/moa/id/auth/builder/SAMLArtifactBuilderTest.java</exclude>
+            <exclude>test/at/gv/egovernment/moa/id/auth/builder/VerifyXMLSignatureRequestBuilderTest.java</exclude>
+            <exclude>test/at/gv/egovernment/moa/id/auth/invoke/IdentityLinkAssertionParserTest.java</exclude>
+            <exclude>test/at/gv/egovernment/moa/id/auth/invoke/MOASPSSTestCase.java</exclude>
+            <exclude>test/at/gv/egovernment/moa/id/auth/invoke/SignatureVerificationTest.java</exclude>
+            <exclude>test/at/gv/egovernment/moa/id/auth/oauth/CertTest.java</exclude>
+            <exclude>test/at/gv/egovernment/moa/id/auth/parser/IdentityLinkAssertionParserTest.java</exclude>
+            <exclude>test/at/gv/egovernment/moa/id/auth/parser/InfoboxReadResponseParserTest.java</exclude>
+            <exclude>test/at/gv/egovernment/moa/id/auth/parser/SAMLArtifactParserTest.java</exclude>
+            <exclude>test/at/gv/egovernment/moa/id/proxy/builder/SAMLArtifactBuilderTest.java</exclude>
+            <exclude>test/at/gv/egovernment/moa/id/proxy/builder/SAMLRequestBuilderTest.java</exclude>
+            <exclude>test/at/gv/egovernment/moa/id/proxy/parser/SAMLResponseParserTest.java</exclude>
+            <exclude>test/at/gv/egovernment/moa/spss/SPSSTestCase.java</exclude>
+            <exclude>test/at/gv/egovernment/moa/spss/api/xmlbind/CreateXMLSignatureRequestParserTest.java</exclude>
+            <exclude>test/at/gv/egovernment/moa/spss/api/xmlbind/TransformParserTest.java</exclude>
+            <exclude>test/at/gv/egovernment/moa/spss/api/xmlbind/VerifyCMSSignatureRequestParserTest.java</exclude>
+            <exclude>test/at/gv/egovernment/moa/spss/api/xmlbind/VerifyXMLSignatureRequestParserTest.java</exclude>
+            <exclude>test/at/gv/egovernment/moa/spss/server/iaik/config/ConfigurationDataImplTest.java</exclude>
+            <exclude>test/at/gv/egovernment/moa/spss/server/iaik/config/IaikConfiguratorTest.java</exclude>
+            <exclude>test/at/gv/egovernment/moa/spss/server/invoke/CMSSignatureVerificationInvokerTest.java</exclude>
+            <exclude>test/at/gv/egovernment/moa/spss/server/invoke/DataObjectFactoryTest.java</exclude>
+            <exclude>test/at/gv/egovernment/moa/spss/server/invoke/TransformationFactoryTest.java</exclude>
+            <exclude>test/at/gv/egovernment/moa/spss/server/invoke/XMLSignatureCreationInvokerTest.java</exclude>
+            <exclude>test/at/gv/egovernment/moa/spss/server/invoke/XMLSignatureVerificationInvokerTest.java</exclude>
+            <exclude>test/at/gv/egovernment/moa/spss/server/tools/CertToolTest.java</exclude>
+            <exclude>test/at/gv/egovernment/moa/util/DOMUtilsTest.java</exclude>
+            <exclude>test/at/gv/egovernment/moa/util/KeyStoreUtilsTest.java</exclude>
+            <exclude>test/at/gv/egovernment/moa/util/SSLUtilsTest.java</exclude>
+            <exclude>test/at/gv/egovernment/moa/util/URLDecoderTest.java</exclude>
+            <exclude>test/at/gv/egovernment/moa/util/URLEncoderTest.java</exclude>
+            <exclude>test/at/gv/egovernment/moa/util/XMLGrammarBuilderTest.java</exclude>
+            <exclude>test/at/gv/egovernment/moa/util/XPathUtilsTest.java</exclude>
+          </excludes>
+        </configuration>
+      </plugin>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-compiler-plugin</artifactId>
+        <version>3.6.1</version>
+        <configuration>
+          <verbose>false</verbose>
+          <fork>true</fork>
+          <executable>${env.BUILD_EXECUTEABLE}</executable>
+          <compilerVersion>${env.BUILD_VERSION}</compilerVersion>
+          <encoding>${project.build.sourceEncoding}</encoding>
+          <source>1.8</source>
+          <target>1.8</target>
+        </configuration>
+      </plugin>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-jar-plugin</artifactId>
+        <version>3.1.2</version>
+        <configuration>
+          <archive>
+            <manifest>
+              <addDefaultImplementationEntries>true</addDefaultImplementationEntries>
+            </manifest>
+          </archive>
+        </configuration>
+      </plugin>
+      <plugin>
+        <inherited>false</inherited>
+        <artifactId>maven-assembly-plugin</artifactId>
+        <!-- <version>2.2-beta-1</version> -->
+        <version>2.2.2</version>
+        <!-- TODO Update Version 2.2-beta-1 for MOA-SPSS -->
+        <configuration>
+          <finalName>moa</finalName>
+          <encoding>UTF-8</encoding>
+          <descriptors>
+            <descriptor>id/assembly-auth-final.xml</descriptor>
+            <descriptor>id/assembly-auth-edu.xml</descriptor>
+            <descriptor>id/assembly-proxy.xml</descriptor>
+
+            <!-- <descriptor>spss/assembly.xml</descriptor> <descriptor>spss/assembly-lib.xml</descriptor> -->
+          </descriptors>
+        </configuration>
+      </plugin>
+
+      <plugin>
+        <groupId>org.codehaus.mojo</groupId>
+        <artifactId>versions-maven-plugin</artifactId>
+        <version>2.7</version>
+      </plugin>
+
+      <!-- Vulnerability checks -->
+      <!-- <plugin> <groupId>org.owasp</groupId> <artifactId>dependency-check-maven</artifactId> 
+        <version>1.2.5</version> <executions> <execution> <phase>verify</phase> <goals> 
+        <goal>check</goal> </goals> </execution> </executions> </plugin> -->
+
+    </plugins>
+
+  </build>
+
+  <reporting>
+    <plugins>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-javadoc-plugin</artifactId>
+        <configuration>
+          <excludePackageNames>test.*</excludePackageNames>
+          <failOnError>false</failOnError>
+        </configuration>
+      </plugin>
+    </plugins>
+  </reporting>
+
+  <dependencyManagement>
+    <dependencies>
+
+      <dependency>
+        <groupId>org.apache.commons</groupId>
+        <artifactId>commons-dbcp2</artifactId>
+        <version>${org.apache.commons.commons.dbcp2}</version>
+      </dependency>
+      <dependency>
+        <groupId>org.opensaml</groupId>
+        <artifactId>opensaml</artifactId>
+        <version>${opensaml.version}</version>
+      </dependency>
+      <dependency>
+        <groupId>org.opensaml</groupId>
+        <artifactId>xmltooling</artifactId>
+        <version>${xmltooling.version}</version>
+      </dependency>
+      <dependency>
+        <groupId>org.opensaml</groupId>
+        <artifactId>openws</artifactId>
+        <version>${org.opensaml.openws.version}</version>
+      </dependency>
+      <dependency>
+        <groupId>org.apache.santuario</groupId>
+        <artifactId>xmlsec</artifactId>
+        <version>${xmlsec.version}</version>
+      </dependency>
+
+      <dependency>
+        <groupId>javax.xml.ws</groupId>
+        <artifactId>jaxws-api</artifactId>
+        <version>${jaxws-api.version}</version>
+      </dependency>
+      <dependency>
+        <groupId>javax.jws</groupId>
+        <artifactId>javax.jws-api</artifactId>
+        <version>${jws-api.version}</version>
+      </dependency>
+
+
+      <dependency>
+        <groupId>com.google.guava</groupId>
+        <artifactId>guava</artifactId>
+        <version>${guava.version}</version>
+      </dependency>
+
+      <dependency>
+        <groupId>org.apache.cxf</groupId>
+        <artifactId>cxf-rt-frontend-jaxws</artifactId>
+        <version>${cxf.version}</version>
+      </dependency>
+      <dependency>
+        <groupId>org.apache.cxf</groupId>
+        <artifactId>cxf-rt-transports-http</artifactId>
+        <version>${cxf.version}</version>
+      </dependency>
+
+      <dependency>
+        <groupId>commons-collections</groupId>
+        <artifactId>commons-collections</artifactId>
+        <version>${org.apache.commons.collections3.version}</version>
+      </dependency>
+
+      <dependency>
+        <groupId>org.apache.commons</groupId>
+        <artifactId>commons-text</artifactId>
+        <version>${org.apache.commons-text.version}</version>
+      </dependency>
+
+      <dependency>
+        <groupId>org.apache.struts</groupId>
+        <artifactId>struts2-core</artifactId>
+        <version>${struts.version}</version>
+      </dependency>
+      <dependency>
+        <groupId>org.apache.struts</groupId>
+        <artifactId>struts2-json-plugin</artifactId>
+        <version>${struts.version}</version>
+      </dependency>
+
+      <dependency>
+        <groupId>at.gv.util</groupId>
+        <artifactId>egovutils</artifactId>
+        <version>${egovutils.version}</version>
+      </dependency>
+
+      <dependency>
+        <groupId>at.gv.egiz.components</groupId>
+        <artifactId>egiz-spring-api</artifactId>
+        <version>${egiz-spring-api.version}</version>
+      </dependency>
+
+      <dependency>
+        <groupId>org.slf4j</groupId>
+        <artifactId>slf4j-api</artifactId>
+        <version>${slf4j.version}</version>
+      </dependency>
+      <dependency>
+        <groupId>org.slf4j</groupId>
+        <artifactId>jcl-over-slf4j</artifactId>
+        <version>${slf4j.version}</version>
+      </dependency>
+      <dependency>
+        <groupId>org.slf4j</groupId>
+        <artifactId>jul-to-slf4j</artifactId>
+        <version>${slf4j.version}</version>
+      </dependency>
+      <dependency>
+        <groupId>org.slf4j</groupId>
+        <artifactId>slf4j-log4j12</artifactId>
+        <version>${slf4j.version}</version>
+      </dependency>
+
+      <dependency>
+        <groupId>jaxen</groupId>
+        <artifactId>jaxen</artifactId>
+        <version>1.1.6</version>
+      </dependency>
+      <dependency>
+        <groupId>saxpath</groupId>
+        <artifactId>saxpath</artifactId>
+        <version>1.0-FCS</version>
+        <scope>compile</scope>
+      </dependency>
+
+      <dependency>
+        <groupId>org.apache.logging.log4j</groupId>
+        <artifactId>log4j-core</artifactId>
+        <version>2.5</version>
+      </dependency>
+
+      <dependency>
+        <groupId>org.apache.httpcomponents</groupId>
+        <artifactId>httpclient</artifactId>
+        <version>${httpclient.version}</version>
+      </dependency>
+
+      <dependency>
+        <groupId>org.apache.httpcomponents</groupId>
+        <artifactId>httpcore</artifactId>
+        <version>${httpcore.version}</version>
+      </dependency>
+
+      <dependency>
+        <groupId>org.postgresql</groupId>
+        <artifactId>postgresql</artifactId>
+        <version>9.3-1102-jdbc41</version>
+      </dependency>
+
+      <dependency>
+        <groupId>javax.mail</groupId>
+        <artifactId>mail</artifactId>
+        <version>1.4.7</version>
+      </dependency>
+      <dependency>
+        <groupId>commons-fileupload</groupId>
+        <artifactId>commons-fileupload</artifactId>
+        <version>1.3.3</version>
+      </dependency>
+      <dependency>
+        <groupId>commons-httpclient</groupId>
+        <artifactId>commons-httpclient</artifactId>
+        <version>3.1</version>
+      </dependency>
+      <dependency>
+        <groupId>dav4j</groupId>
+        <artifactId>dav4j</artifactId>
+        <version>0.1</version>
+        <scope>compile</scope>
+      </dependency>
+      <dependency>
+        <groupId>httpsclient</groupId>
+        <artifactId>httpsclient</artifactId>
+        <version>JSSE-1.0</version>
+        <scope>compile</scope>
+      </dependency>
+      <!-- <dependency> <groupId>regexp</groupId> <artifactId>regexp</artifactId> 
+        <version>1.3</version> </dependency> -->
+
+
+      <!-- <dependency> <groupId>org.bouncycastle</groupId> <artifactId>bcprov-jdk16</artifactId> 
+        <version>1.46</version> </dependency> -->
+
+      <dependency>
+        <groupId>at.gv.egiz.eaaf</groupId>
+        <artifactId>eaaf_core_api</artifactId>
+        <version>${egiz.eaaf.version}</version>
+      </dependency>
+      <dependency>
+        <groupId>at.gv.egiz.eaaf</groupId>
+        <artifactId>eaaf-core</artifactId>
+        <version>${egiz.eaaf.version}</version>
+      </dependency>
+      <dependency>
+        <groupId>at.gv.egiz.eaaf</groupId>
+        <artifactId>eaaf-core</artifactId>
+        <type>test-jar</type>
+        <version>${egiz.eaaf.version}</version>
+        <scope>test</scope>
+      </dependency>
+      <dependency>
+        <groupId>at.gv.egiz.eaaf</groupId>
+        <artifactId>eaaf_module_pvp2_idp</artifactId>
+        <version>${egiz.eaaf.version}</version>
+      </dependency>
+      <dependency>
+        <groupId>at.gv.egiz.eaaf</groupId>
+        <artifactId>eaaf_module_pvp2_sp</artifactId>
+        <version>${egiz.eaaf.version}</version>
+      </dependency>
+      <dependency>
+        <groupId>at.gv.egiz.eaaf</groupId>
+        <artifactId>eaaf_module_pvp2_core</artifactId>
+        <version>${egiz.eaaf.version}</version>
+      </dependency>
+      <dependency>
+        <groupId>at.gv.egiz.eaaf</groupId>
+        <artifactId>eaaf_module_auth_sl20</artifactId>
+        <version>${egiz.eaaf.version}</version>
+      </dependency>
+      <dependency>
+        <groupId>at.gv.egiz.eaaf</groupId>
+        <artifactId>eaaf_core_utils</artifactId>
+        <version>${egiz.eaaf.version}</version>
+        <scope>test</scope>
+        <type>test-jar</type>
+      </dependency>
+      <dependency>
+        <groupId>at.gv.egiz.eaaf</groupId>
+        <artifactId>eaaf-core</artifactId>
+        <version>${egiz.eaaf.version}</version>
+        <scope>test</scope> 
+        <type>test-jar</type>
+      </dependency>
+
+
+      <dependency>
+        <groupId>MOA.id.server</groupId>
+        <artifactId>moa-id-spring-initializer</artifactId>
+        <version>${moa-id-version}</version>
+      </dependency>
+
+      <dependency>
+        <groupId>MOA.id.server</groupId>
+        <artifactId>moa-id-frontend-resources</artifactId>
+        <version>${moa-id-version}</version>
+      </dependency>
+
+      <dependency>
+        <groupId>MOA.id</groupId>
+        <artifactId>moa-spss-container</artifactId>
+        <version>${moa-id-version}</version>
+        <type>pom</type>
+      </dependency>
+
+
+
+      <dependency>
+        <groupId>MOA.id.server</groupId>
+        <artifactId>moa-id-lib</artifactId>
+        <version>${moa-id-version}</version>
+        <scope>compile</scope>
+      </dependency>
+      <dependency>
+        <groupId>MOA.id.server</groupId>
+        <artifactId>moa-id-commons</artifactId>
+        <version>${moa-id-version}</version>
+        <scope>compile</scope>
+      </dependency>
+
+      <dependency>
+        <groupId>MOA.id.server</groupId>
+        <artifactId>moa-id-jaxb_classes</artifactId>
+        <version>${moa-id-version}</version>
+      </dependency>
+
+      <dependency>
+        <groupId>MOA.id.server</groupId>
+        <artifactId>moa-id-lib</artifactId>
+        <version>${moa-id-version}</version>
+        <scope>test</scope>
+        <type>test-jar</type>
+      </dependency>
+
+      <dependency>
+        <groupId>MOA.id.server.modules</groupId>
+        <artifactId>moa-id-module-stork</artifactId>
+        <version>${moa-id-version}</version>
+      </dependency>
+      <dependency>
+        <groupId>MOA.id.server.modules</groupId>
+        <artifactId>moa-id-module-monitoring</artifactId>
+        <version>${moa-id-version}</version>
+      </dependency>
+      <dependency>
+        <groupId>MOA.id.server.modules</groupId>
+        <artifactId>moa-id-module-saml1</artifactId>
+        <version>${moa-id-version}</version>
+      </dependency>
+      <dependency>
+        <groupId>MOA.id.server.modules</groupId>
+        <artifactId>moa-id-module-openID</artifactId>
+        <version>${moa-id-version}</version>
+      </dependency>
+      <dependency>
+        <groupId>MOA.id.server.modules</groupId>
+        <artifactId>moa-id-modul-citizencard_authentication</artifactId>
+        <version>${moa-id-version}</version>
+      </dependency>
+      <dependency>
+        <groupId>MOA.id.server.modules</groupId>
+        <artifactId>moa-id-module-eIDAS</artifactId>
+        <version>${moa-id-version}</version>
+      </dependency>
+      <dependency>
+        <groupId>MOA.id.server.modules</groupId>
+        <artifactId>moa-id-module-pvp2</artifactId>
+        <version>${moa-id-version}</version>
+      </dependency>
+      <dependency>
+        <groupId>MOA.id.server.modules</groupId>
+        <artifactId>moa-id-modules-federated_authentication</artifactId>
+        <version>${moa-id-version}</version>
+      </dependency>
+
+      <dependency>
+        <groupId>MOA.id.server.modules</groupId>
+        <artifactId>moa-id-module-elga_mandate_service</artifactId>
+        <version>${moa-id-module-elga_mandate_client}</version>
+      </dependency>
+
+      <dependency>
+        <groupId>MOA.id.server.modules</groupId>
+        <artifactId>moa-id-module-bkaMobilaAuthSAML2Test</artifactId>
+        <version>${moa-id-version}</version>
+      </dependency>
+
+      <dependency>
+        <groupId>MOA.id.server.modules</groupId>
+        <artifactId>moa-id-module-sl20_authentication</artifactId>
+        <version>${moa-id-version}</version>
+      </dependency>
+
+      <dependency>
+        <groupId>MOA.id.server.modules</groupId>
+        <artifactId>moa-id-module-AT_eIDAS_connector</artifactId>
+        <version>${moa-id-version}</version>
+      </dependency>
+
+      <dependency>
+        <groupId>MOA.id.server.modules</groupId>
+        <artifactId>moa-id-module-EID_connector</artifactId>
+        <version>${moa-id-version}</version>
+      </dependency>
+
+
+      <dependency>
+        <groupId>MOA.id.server</groupId>
+        <artifactId>moa-id-commons</artifactId>
+        <version>${moa-id-version}</version>
+        <type>test-jar</type>
+        <scope>test</scope>
+      </dependency>
+
+      <dependency>
+        <groupId>junit</groupId>
+        <artifactId>junit</artifactId>
+        <version>${junit.version}</version>
+        <scope>test</scope>
+      </dependency>
+      <dependency>
+        <groupId>commons-logging</groupId>
+        <artifactId>commons-logging</artifactId>
+        <version>1.2</version>
+        <scope>compile</scope>
+      </dependency>
+
+      <dependency>
+        <groupId>javax.servlet</groupId>
+        <artifactId>javax.servlet-api</artifactId>
+        <version>3.0.1</version>
+        <scope>provide</scope>
+      </dependency>
+      <dependency>
+        <groupId>javax.activation</groupId>
+        <artifactId>activation</artifactId>
+        <version>1.1.1</version>
+        <scope>compile</scope>
+      </dependency>
+      <dependency>
+        <groupId>commons-discovery</groupId>
+        <artifactId>commons-discovery</artifactId>
+        <version>0.5</version>
+        <scope>compile</scope>
+      </dependency>
+      <!-- IAIK libraries -->
+      <dependency>
+        <groupId>iaik.prod</groupId>
+        <artifactId>iaik_jce_full</artifactId>
+        <version>5.52_moa</version>
+      </dependency>
+
+      <dependency>
+        <groupId>iaik.prod</groupId>
+        <artifactId>iaik_X509TrustManager</artifactId>
+        <version>0.3.1</version>
+        <scope>compile</scope>
+      </dependency>
+      <dependency>
+        <groupId>iaik.prod</groupId>
+        <artifactId>iaik_Pkcs11Provider</artifactId>
+        <version>1.2.4</version>
+        <scope>runtime</scope>
+      </dependency>
+      <dependency>
+        <groupId>iaik.prod</groupId>
+        <artifactId>iaik_Pkcs11Wrapper</artifactId>
+        <version>1.2.17</version>
+        <scope>compile</scope>
+      </dependency>
+      <dependency>
+        <groupId>iaik.prod</groupId>
+        <artifactId>iaik_Pkcs11Wrapper</artifactId>
+        <version>1.2.17</version>
+        <classifier>win32</classifier>
+        <type>dll</type>
+        <scope>runtime</scope>
+      </dependency>
+      <dependency>
+        <groupId>iaik.prod</groupId>
+        <artifactId>iaik_Pkcs11Wrapper</artifactId>
+        <version>1.2.17</version>
+        <classifier>linux</classifier>
+        <type>so</type>
+        <scope>runtime</scope>
+      </dependency>
+      <dependency>
+        <groupId>iaik.prod</groupId>
+        <artifactId>iaik_Pkcs11Wrapper</artifactId>
+        <version>1.2.17</version>
+        <classifier>linux_x64</classifier>
+        <type>so</type>
+        <scope>runtime</scope>
+      </dependency>
+      <dependency>
+        <groupId>iaik.prod</groupId>
+        <artifactId>iaik_Pkcs11Wrapper</artifactId>
+        <version>1.2.17</version>
+        <classifier>solaris_sparc</classifier>
+        <type>so</type>
+        <scope>runtime</scope>
+      </dependency>
+      <dependency>
+        <groupId>iaik.prod</groupId>
+        <artifactId>iaik_Pkcs11Wrapper</artifactId>
+        <version>1.2.17</version>
+        <classifier>solaris_sparcv9</classifier>
+        <type>so</type>
+        <scope>runtime</scope>
+      </dependency>
+      <dependency>
+        <groupId>iaik.prod</groupId>
+        <artifactId>iaik_Pkcs11Wrapper</artifactId>
+        <version>1.2.17</version>
+        <classifier>win64</classifier>
+        <type>dll</type>
+        <scope>runtime</scope>
+      </dependency>
+
+      <dependency>
+        <groupId>javax.xml.bind</groupId>
+        <artifactId>jaxb-api</artifactId>
+        <version>${jaxb.version}</version>
+      </dependency>
+
+      <dependency>
+        <groupId>xerces</groupId>
+        <artifactId>xercesImpl</artifactId>
+        <version>2.11.0</version>
+        <scope>compile</scope>
+      </dependency>
+      <!-- The xmlParserAPIs.jar of the official xalan distribution and the 
+        one in the central repository differ. So, we are going to include the official 
+        one in our own distribution to prevent from problems with different versions 
+        in the endorsed directory of the servlet container or jre endorsed directory. -->
+      <dependency>
+        <groupId>xalan-bin-dist</groupId>
+        <artifactId>xml-apis</artifactId>
+        <version>2.11.0</version>
+        <scope>runtime</scope>
+      </dependency>
+      <!-- The xalan.jar of the official xalan distribution and the one in 
+        the central repository differ. So, we are going to include the official one 
+        in our own distribution to prevent from problems with different versions 
+        in the endorsed directory of the servlet container or jre endorsed directory. -->
+      <dependency>
+        <groupId>xalan-bin-dist</groupId>
+        <artifactId>xalan</artifactId>
+        <version>2.7.1</version>
+        <scope>compile</scope><!-- for XPathAPI, Javadoc,... -->
+      </dependency>
+      <dependency>
+        <groupId>xalan-bin-dist</groupId>
+        <artifactId>serializer</artifactId>
+        <version>2.7.1</version><!-- xalan version -->
+        <scope>runtime</scope>
+      </dependency>
+
+      <dependency>
+        <groupId>org.springframework</groupId>
+        <artifactId>spring-webmvc</artifactId>
+        <version>${org.springframework.version}</version>
+      </dependency>
+
+      <dependency>
+        <groupId>org.springframework.data</groupId>
+        <artifactId>spring-data-redis</artifactId>
+        <version>${org.springframework.data.spring-data-redis}</version>
+      </dependency>
+
+
+      <!-- the core, which includes Streaming API, shared low-level abstractions 
+        (but NOT data-binding) -->
+      <dependency>
+        <groupId>com.fasterxml.jackson.core</groupId>
+        <artifactId>jackson-core</artifactId>
+        <version>${jackson-version}</version>
+      </dependency>
+      <!-- databinding; ObjectMapper, JsonNode and related classes are here -->
+      <dependency>
+        <groupId>com.fasterxml.jackson.core</groupId>
+        <artifactId>jackson-databind</artifactId>
+        <version>${jackson-version}</version>
+      </dependency>
+      <dependency>
+        <groupId>com.fasterxml.jackson.core</groupId>
+        <artifactId>jackson-annotations</artifactId>
+        <version>${jackson-version}</version>
+      </dependency>
+      <dependency>
+        <groupId>commons-cli</groupId>
+        <artifactId>commons-cli</artifactId>
+        <version>${apache-cli-version}</version>
+      </dependency>
+
+      <dependency>
+        <groupId>com.sun.xml.bind</groupId>
+        <artifactId>jaxb-core</artifactId>
+        <version>${jaxb-core.version}</version>
+      </dependency>
+      <dependency>
+        <groupId>com.sun.xml.bind</groupId>
+        <artifactId>jaxb-impl</artifactId>
+        <version>${jaxb.version}</version>
+      </dependency>
+
+      <dependency>
+        <groupId>org.easymock</groupId>
+        <artifactId>easymock</artifactId>
+        <scope>test</scope>
+        <version>3.5</version>
+      </dependency>
+      <dependency>
+        <groupId>org.unitils</groupId>
+        <artifactId>unitils-core</artifactId>
+        <version>3.4.6</version>
+      </dependency>
+
+    </dependencies>
+  </dependencyManagement>
+
+  <dependencies>
+    <dependency>
+      <groupId>iaik.prod</groupId>
+      <artifactId>iaik_Pkcs11Wrapper</artifactId>
+      <classifier>win32</classifier>
+      <type>dll</type>
+      <scope>runtime</scope>
+    </dependency>
+    <dependency>
+      <groupId>iaik.prod</groupId>
+      <artifactId>iaik_Pkcs11Wrapper</artifactId>
+      <classifier>linux</classifier>
+      <type>so</type>
+      <scope>runtime</scope>
+    </dependency>
+    <dependency>
+      <groupId>iaik.prod</groupId>
+      <artifactId>iaik_Pkcs11Wrapper</artifactId>
+      <classifier>linux_x64</classifier>
+      <type>so</type>
+      <scope>runtime</scope>
+    </dependency>
+    <dependency>
+      <groupId>iaik.prod</groupId>
+      <artifactId>iaik_Pkcs11Wrapper</artifactId>
+      <classifier>solaris_sparc</classifier>
+      <type>so</type>
+      <scope>runtime</scope>
+    </dependency>
+    <dependency>
+      <groupId>iaik.prod</groupId>
+      <artifactId>iaik_Pkcs11Wrapper</artifactId>
+      <classifier>solaris_sparcv9</classifier>
+      <type>so</type>
+      <scope>runtime</scope>
+    </dependency>
+    <dependency>
+      <groupId>iaik.prod</groupId>
+      <artifactId>iaik_Pkcs11Wrapper</artifactId>
+      <classifier>win64</classifier>
+      <type>dll</type>
+      <scope>runtime</scope>
+    </dependency>
+    <dependency>
+      <groupId>commons-io</groupId>
+      <artifactId>commons-io</artifactId>
+      <version>${org.apache.commons.io.version}</version>
+    </dependency>
+
+  </dependencies>
+
+  <repositories>
+    <repository>
+      <id>MOA</id>
+      <name>MOA Dependencies</name>
+      <!--releases> <enabled>false</enabled> </releases -->
+      <layout>default</layout>
+      <url>file://${repositoryPath}</url>
+    </repository>
+  </repositories>
 </project>