Merge branch 'huge_refactoring' into development_preview

# Conflicts:
#	id/server/doc/handbook/config/config.html
#	id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/config/auth/OAAuthParameterDecorator.java
#	id/server/modules/moa-id-modul-citizencard_authentication/src/main/java/at/gv/egovernment/moa/id/auth/AuthenticationServer.java
#	id/server/modules/moa-id-modul-citizencard_authentication/src/main/java/at/gv/egovernment/moa/id/auth/modules/internal/tasks/VerifyAuthenticationBlockTask.java
#	id/server/modules/moa-id-modul-citizencard_authentication/src/main/java/at/gv/egovernment/moa/id/auth/validator/CreateXMLSignatureResponseValidator.java

1 files changed, 65 insertions, 29 deletions

diff --git a/pom.xml b/pom.xml
index 8eadbff39..f7733d6b1 100644
--- a/pom.xml
+++ b/pom.xml
@@ -10,33 +10,25 @@
     <properties>
         <repositoryPath>${basedir}/repository</repositoryPath>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-
-		<!--
-		<moa-commons-version>2.0.1</moa-commons-version>
-		<moa-id-version>2.1.2</moa-id-version>
-		<moa-id-proxy-version>2.0.0</moa-id-proxy-version>
-		<moa-spss-version>2.0.3</moa-spss-version>
-		<configtool-version>1.1.4</configtool-version>
-		<demo-oa-version>2.0.2</demo-oa-version>
-		<moa-commons-version>2.0.1</moa-commons-version>
-		-->
 		
 			<!-- Project Version -->			
-			<moa-id-version>3.3.3-snapshot</moa-id-version>
+			<moa-id-version>3.4.0</moa-id-version>
 			
-			<moa-id-version-final>3.3.3-snapshot</moa-id-version-final>			
-			<moa-id-version-edu>3.3.3-snapshot</moa-id-version-edu>			
+			<moa-id-version-final>3.4.0</moa-id-version-final>			
+			<moa-id-version-edu>3.4.0</moa-id-version-edu>			
 			
 			<moa-id-proxy-version>2.0.1</moa-id-proxy-version>
 			
-			<configtool-version>2.4.2-snapshot</configtool-version>
+			<configtool-version>2.5.0</configtool-version>
 			<demo-oa-version>2.0.6</demo-oa-version>
 			
-			<moa-id-module-elga_mandate_client>1.3</moa-id-module-elga_mandate_client>
-							
-			<org.springframework.version>4.3.13.RELEASE</org.springframework.version>
-			<org.springframework.data.spring-data-jpa>1.11.9.RELEASE</org.springframework.data.spring-data-jpa>
-			<surefire.version>2.20.1</surefire.version>		
+			<moa-id-module-elga_mandate_client>1.3.2</moa-id-module-elga_mandate_client>
+
+			<!-- =================================================================================== -->
+			<egiz.eaaf.version>1.0.0</egiz.eaaf.version>							
+			<org.springframework.version>4.3.18.RELEASE</org.springframework.version>
+			<org.springframework.data.spring-data-jpa>1.11.13.RELEASE</org.springframework.data.spring-data-jpa>
+			<surefire.version>2.22.0</surefire.version>		
 			
 			<jaxb.version>2.3.0</jaxb.version>
 			
@@ -44,29 +36,29 @@
 			<xmltooling.version>1.4.6</xmltooling.version>
 			<xmlsec.version>2.1.0</xmlsec.version>
 			
-			<hibernate.version>5.2.12.Final</hibernate.version>
-			<org.apache.commons.commons.dbcp2>2.2.0</org.apache.commons.commons.dbcp2> 
+			<hibernate.version>5.2.17.Final</hibernate.version>
+			<org.apache.commons.commons.dbcp2>2.4.0</org.apache.commons.commons.dbcp2> 
 						
-			<cxf.version>3.2.0</cxf.version>			
-			<struts.version>2.5.14.1</struts.version> <!-- 2.5.10.1 -->
+			<cxf.version>3.2.5</cxf.version>			
+			<struts.version>2.5.16</struts.version> <!-- 2.5.10.1 -->
 			
 			<egovutils.version>2.0.0</egovutils.version>
 			
 			<slf4j.version>1.7.25</slf4j.version>						
 			
-			<httpclient.version>4.5.3</httpclient.version>
-			<httpcore.version>4.4.8</httpcore.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>6.0.6</mysql-connector.java>
 			<!-- <mysql-connector.java>5.1.40</mysql-connector.java> -->			
 						
 			<junit.version>4.12</junit.version>			
-			<org.apache.commons.io.version>2.5</org.apache.commons.io.version>
-			<org.apache.commons.lang3.version>3.6</org.apache.commons.lang3.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.9.9</jodatime.version>
+			<jodatime.version>2.10</jodatime.version>
 			
 			<jackson-version>2.9.1</jackson-version>
 	    <apache-cli-version>1.4</apache-cli-version>
@@ -436,7 +428,37 @@
 							<version>1.46</version>
 						</dependency> -->
 
-      			<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>MOA.id.server</groupId>
 							<artifactId>moa-id-spring-initializer</artifactId>
 							<version>${moa-id-version}</version>
@@ -538,6 +560,18 @@
 			</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>
@@ -699,6 +733,8 @@
 				<version>${org.springframework.version}</version>
 			</dependency>
 			
+			
+			
             <!-- the core, which includes Streaming API, shared low-level abstractions (but NOT data-binding) -->
             <dependency>
                 <groupId>com.fasterxml.jackson.core</groupId>