From 5d83525a967b66e74b4bd868de7f9805d5d52f84 Mon Sep 17 00:00:00 2001
From: Thomas Lenz <tlenz@iaik.tugraz.at>
Date: Wed, 16 Dec 2015 08:07:12 +0100
Subject: add empty eIDAS module

---
 pom.xml | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

(limited to 'pom.xml')

diff --git a/pom.xml b/pom.xml
index 28c2d1588..b991b92e9 100644
--- a/pom.xml
+++ b/pom.xml
@@ -455,7 +455,13 @@
 				<groupId>MOA.id.server.modules</groupId>
 				<artifactId>moa-id-modul-citizencard_authentication</artifactId>
 				<version>${moa-id-version}</version>
-			</dependency>   
+			</dependency>
+			<dependency>
+				<groupId>MOA.id.server.modules</groupId>
+				<artifactId>moa-id-module-eIDAS</artifactId>
+				<version>${moa-id-version}</version>
+			</dependency>
+			   
 			              
             <dependency>
                 <groupId>MOA.spss.server</groupId>
-- 
cgit v1.2.3


From abd4a6743f610bf85392b6517457ae353e7e3322 Mon Sep 17 00:00:00 2001
From: Thomas Lenz <tlenz@iaik.tugraz.at>
Date: Fri, 22 Jan 2016 13:56:40 +0100
Subject: change version to 3.2.0-Snapshot which is alias for OPB

---
 pom.xml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'pom.xml')

diff --git a/pom.xml b/pom.xml
index b9c929b40..05b2ccaef 100644
--- a/pom.xml
+++ b/pom.xml
@@ -22,11 +22,11 @@
 		-->
 		
 			<!-- Project Version -->
-			<moa-commons-version>3.1.0-RC1</moa-commons-version>
-			<moa-id-version>3.1.0-RC1</moa-id-version>
+			<moa-commons-version>3.2.0-OPB-Snapshot</moa-commons-version>
+			<moa-id-version>3.2.0-OPB-Snapshot</moa-id-version>
 			<moa-id-proxy-version>2.0.1-Snapshot</moa-id-proxy-version>
 			<moa-spss-version>2.0.5-RC1</moa-spss-version>
-			<configtool-version>2.1.0-RC1</configtool-version>
+			<configtool-version>2.2.0-OPB-Snapshot</configtool-version>
 			<demo-oa-version>2.0.5</demo-oa-version>
 		
 			<!-- Library Versions -->
-- 
cgit v1.2.3


From 77bcf9be400312591244c6c00ff142d45d6586ad Mon Sep 17 00:00:00 2001
From: Thomas Lenz <tlenz@iaik.tugraz.at>
Date: Thu, 28 Jan 2016 08:33:10 +0100
Subject: fix maven dependency build problem

---
 pom.xml | 8 ++++++++
 1 file changed, 8 insertions(+)

(limited to 'pom.xml')

diff --git a/pom.xml b/pom.xml
index 05b2ccaef..a68b5f1c4 100644
--- a/pom.xml
+++ b/pom.xml
@@ -437,6 +437,14 @@
             	<version>${moa-id-version}</version>
               <scope>compile</scope>
         		</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>
-- 
cgit v1.2.3


From f441b49a4eadb475396217901bbbc49973ca8107 Mon Sep 17 00:00:00 2001
From: Thomas Lenz <tlenz@iaik.tugraz.at>
Date: Mon, 22 Feb 2016 11:35:18 +0100
Subject: add first parts of new federated authentication modul

---
 pom.xml | 11 +++++++++++
 1 file changed, 11 insertions(+)

(limited to 'pom.xml')

diff --git a/pom.xml b/pom.xml
index a68b5f1c4..14a30d3c0 100644
--- a/pom.xml
+++ b/pom.xml
@@ -475,6 +475,17 @@
 				<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>
-- 
cgit v1.2.3


From c732eccaaa0bae8ec551dabfed165991b1c2fcff Mon Sep 17 00:00:00 2001
From: Thomas Lenz <tlenz@iaik.tugraz.at>
Date: Fri, 26 Feb 2016 08:31:11 +0100
Subject: Add initial version of ELGA mandate-service authentication-module

---
 pom.xml | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

(limited to 'pom.xml')

diff --git a/pom.xml b/pom.xml
index 14a30d3c0..a450357d8 100644
--- a/pom.xml
+++ b/pom.xml
@@ -28,6 +28,8 @@
 			<moa-spss-version>2.0.5-RC1</moa-spss-version>
 			<configtool-version>2.2.0-OPB-Snapshot</configtool-version>
 			<demo-oa-version>2.0.5</demo-oa-version>
+			
+			<moa-id-module-elga_mandate_client>1.0.0-Snapshot</moa-id-module-elga_mandate_client>
 		
 			<!-- Library Versions -->
 			<org.springframework.version>4.2.4.RELEASE</org.springframework.version>
@@ -480,12 +482,18 @@
 				<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>
-- 
cgit v1.2.3


From b9937af42fdab6b85aa1121148bda474c70f5e75 Mon Sep 17 00:00:00 2001
From: Thomas Lenz <tlenz@iaik.tugraz.at>
Date: Tue, 8 Mar 2016 11:10:19 +0100
Subject: finish first beta-version of ELGA mandate-service client-module

---
 pom.xml | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

(limited to 'pom.xml')

diff --git a/pom.xml b/pom.xml
index a450357d8..ed1c361f8 100644
--- a/pom.xml
+++ b/pom.xml
@@ -421,6 +421,12 @@
 							<version>1.46</version>
 						</dependency>
 
+      			<dependency>
+							<groupId>MOA.id.server</groupId>
+							<artifactId>moa-id-spring-initializer</artifactId>
+							<version>${moa-id-version}</version>
+						</dependency>
+
             <dependency>
                 <groupId>MOA</groupId>
                 <artifactId>moa-common</artifactId>
@@ -446,7 +452,7 @@
   						<scope>test</scope>
   						<type>test-jar</type>
   					</dependency>
-        		
+               		
 			<dependency>
 				<groupId>MOA.id.server.modules</groupId>
 				<artifactId>moa-id-module-stork</artifactId>
-- 
cgit v1.2.3


From f66ed1831a4877d6c7cb3c55bbc3fd84024a1523 Mon Sep 17 00:00:00 2001
From: Thomas Lenz <tlenz@iaik.tugraz.at>
Date: Wed, 9 Mar 2016 09:14:38 +0100
Subject: move main frontend GUI to seperate package

---
 pom.xml | 6 ++++++
 1 file changed, 6 insertions(+)

(limited to 'pom.xml')

diff --git a/pom.xml b/pom.xml
index ed1c361f8..467f2cf28 100644
--- a/pom.xml
+++ b/pom.xml
@@ -427,6 +427,12 @@
 							<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</groupId>
                 <artifactId>moa-common</artifactId>
-- 
cgit v1.2.3


From d60ceb70869148deb9f85751c63460fa245a8c7f Mon Sep 17 00:00:00 2001
From: Thomas Lenz <tlenz@iaik.tugraz.at>
Date: Wed, 9 Mar 2016 12:14:18 +0100
Subject: split moa-id-auth in a final- and an edjucation- version

---
 pom.xml | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

(limited to 'pom.xml')

diff --git a/pom.xml b/pom.xml
index 467f2cf28..9fb67e58a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -23,7 +23,11 @@
 		
 			<!-- Project Version -->
 			<moa-commons-version>3.2.0-OPB-Snapshot</moa-commons-version>
+			
 			<moa-id-version>3.2.0-OPB-Snapshot</moa-id-version>
+			<moa-id-version-final>3.2.0-RC1</moa-id-version-final>
+			<moa-id-version-edu>3.2.0-OPB-Snapshot</moa-id-version-edu>			
+			
 			<moa-id-proxy-version>2.0.1-Snapshot</moa-id-proxy-version>
 			<moa-spss-version>2.0.5-RC1</moa-spss-version>
 			<configtool-version>2.2.0-OPB-Snapshot</configtool-version>
@@ -218,7 +222,8 @@
                     <finalName>moa</finalName>
                     <encoding>UTF-8</encoding>
                     <descriptors>
-                        <descriptor>id/assembly-auth.xml</descriptor>
+                        <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>
-- 
cgit v1.2.3


From 74d8c83f76074d2d0df784cb4a305c586a702d25 Mon Sep 17 00:00:00 2001
From: Thomas Lenz <tlenz@iaik.tugraz.at>
Date: Wed, 9 Mar 2016 13:41:09 +0100
Subject: move moa-common to moa-id-common, because MOA-SPSS becomes a seperate
 project

---
 pom.xml | 36 +++++++++++++++++++++---------------
 1 file changed, 21 insertions(+), 15 deletions(-)

(limited to 'pom.xml')

diff --git a/pom.xml b/pom.xml
index 9fb67e58a..a84bbc27b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -29,12 +29,15 @@
 			<moa-id-version-edu>3.2.0-OPB-Snapshot</moa-id-version-edu>			
 			
 			<moa-id-proxy-version>2.0.1-Snapshot</moa-id-proxy-version>
-			<moa-spss-version>2.0.5-RC1</moa-spss-version>
+			
 			<configtool-version>2.2.0-OPB-Snapshot</configtool-version>
 			<demo-oa-version>2.0.5</demo-oa-version>
 			
 			<moa-id-module-elga_mandate_client>1.0.0-Snapshot</moa-id-module-elga_mandate_client>
 		
+		
+			<moa-spss-version>2.0.5-RC1</moa-spss-version>
+		
 			<!-- Library Versions -->
 			<org.springframework.version>4.2.4.RELEASE</org.springframework.version>
 			<surefire.version>2.18.1</surefire.version>		
@@ -69,9 +72,11 @@
                 </property>
             </activation>
             <modules>
-                <module>common</module>
-                <module>spss</module>
+<!--                 <module>common</module> -->                
+<!--                 <module>spss</module> -->
+
                 <module>id</module>
+                
             </modules>
             <repositories>
                 <repository>
@@ -224,9 +229,10 @@
                     <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>
+                        <descriptor>id/assembly-proxy.xml</descriptor>   
+                                              
+<!--                         <descriptor>spss/assembly.xml</descriptor>
+                        <descriptor>spss/assembly-lib.xml</descriptor> -->
                     </descriptors>
                 </configuration>
             </plugin>
@@ -438,12 +444,12 @@
   						<version>${moa-id-version}</version>
 						</dependency>
 
-            <dependency>
+<!--             <dependency>
                 <groupId>MOA</groupId>
                 <artifactId>moa-common</artifactId>
                 <version>${moa-commons-version}</version>
                 <scope>compile</scope>
-            </dependency>
+            </dependency> -->
             <dependency>
                 <groupId>MOA.id.server</groupId>
                 <artifactId>moa-id-lib</artifactId>
@@ -511,27 +517,27 @@
     		<version>${moa-id-module-elga_mandate_client}</version>
 			</dependency>
 
-			   
-			              
-            <dependency>
+			   			              
+             <dependency>
                 <groupId>MOA.spss.server</groupId>
                 <artifactId>moa-spss-lib</artifactId>
                 <version>${moa-spss-version}</version>
                 <scope>compile</scope>
             </dependency>
-            <dependency>
+            
+<!--             <dependency>
                 <groupId>MOA</groupId>
                 <artifactId>moa-common</artifactId>
                 <version>${moa-commons-version}</version>
                 <type>test-jar</type>
                 <scope>test</scope>
-            </dependency>
-            <dependency>
+            </dependency> -->
+<!--             <dependency>
                 <groupId>MOA.spss.server</groupId>
                 <artifactId>moa-spss-tools</artifactId>
                 <version>${moa-spss-version}</version>
                 <scope>test</scope>
-             </dependency>
+             </dependency> -->
             <dependency>
                 <groupId>junit</groupId>
                 <artifactId>junit</artifactId>
-- 
cgit v1.2.3


From 989f5cfa9c9c6f60ce6e161983be8434ca87a698 Mon Sep 17 00:00:00 2001
From: Thomas Lenz <tlenz@iaik.tugraz.at>
Date: Wed, 9 Mar 2016 16:01:38 +0100
Subject: remove MOA-SPSS from buildpath and add MOA-SPSS container-modul

---
 pom.xml | 31 +++++++++++++++----------------
 1 file changed, 15 insertions(+), 16 deletions(-)

(limited to 'pom.xml')

diff --git a/pom.xml b/pom.xml
index a84bbc27b..68620b71b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -21,9 +21,7 @@
 		<moa-commons-version>2.0.1</moa-commons-version>
 		-->
 		
-			<!-- Project Version -->
-			<moa-commons-version>3.2.0-OPB-Snapshot</moa-commons-version>
-			
+			<!-- Project Version -->			
 			<moa-id-version>3.2.0-OPB-Snapshot</moa-id-version>
 			<moa-id-version-final>3.2.0-RC1</moa-id-version-final>
 			<moa-id-version-edu>3.2.0-OPB-Snapshot</moa-id-version-edu>			
@@ -444,12 +442,12 @@
   						<version>${moa-id-version}</version>
 						</dependency>
 
-<!--             <dependency>
-                <groupId>MOA</groupId>
-                <artifactId>moa-common</artifactId>
-                <version>${moa-commons-version}</version>
-                <scope>compile</scope>
-            </dependency> -->
+						<dependency>
+							<groupId>MOA.id</groupId>
+							<artifactId>moa-spss-container</artifactId>
+  						<version>${moa-id-version}</version>
+						</dependency>
+						
             <dependency>
                 <groupId>MOA.id.server</groupId>
                 <artifactId>moa-id-lib</artifactId>
@@ -525,19 +523,20 @@
                 <scope>compile</scope>
             </dependency>
             
-<!--             <dependency>
-                <groupId>MOA</groupId>
-                <artifactId>moa-common</artifactId>
-                <version>${moa-commons-version}</version>
+             <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>
+            </dependency>
+            <dependency>
                 <groupId>MOA.spss.server</groupId>
                 <artifactId>moa-spss-tools</artifactId>
                 <version>${moa-spss-version}</version>
                 <scope>test</scope>
-             </dependency> -->
+             </dependency>
+             
             <dependency>
                 <groupId>junit</groupId>
                 <artifactId>junit</artifactId>
-- 
cgit v1.2.3


From 23cded37cfe100bf51480c08827166666e464c6c Mon Sep 17 00:00:00 2001
From: Thomas Lenz <tlenz@iaik.tugraz.at>
Date: Fri, 18 Mar 2016 11:35:31 +0100
Subject: update slf4j

---
 pom.xml | 14 +++++++++++---
 1 file changed, 11 insertions(+), 3 deletions(-)

(limited to 'pom.xml')

diff --git a/pom.xml b/pom.xml
index 68620b71b..4117c52b4 100644
--- a/pom.xml
+++ b/pom.xml
@@ -44,7 +44,7 @@
 			<cxf.version>3.1.4</cxf.version>
 			<struts.version>2.3.24.1</struts.version>
 			<egovutils.version>2.0.0</egovutils.version>
-			<slf4j.version>1.7.13</slf4j.version>
+			<slf4j.version>1.7.19</slf4j.version>
 			<hibernate.version>4.3.11.Final</hibernate.version>
 			<mysql-connector.java>5.1.38</mysql-connector.java>			
 			<junit.version>4.11</junit.version>
@@ -373,12 +373,20 @@
                 <scope>compile</scope> 
             </dependency>
 
-            <dependency>
+   <!--          <dependency>
                 <groupId>log4j</groupId>
                 <artifactId>log4j</artifactId>
                 <version>1.2.17</version>
                 <scope>compile</scope>
-            </dependency>
+            </dependency> -->
+ 						<dependency>
+							<groupId>org.apache.logging.log4j</groupId>
+							<artifactId>log4j-core</artifactId>
+							<version>2.5</version>
+						</dependency>            					
+            					
+            					
+            
 						<dependency>
 							<groupId>org.postgresql</groupId>
 							<artifactId>postgresql</artifactId>
-- 
cgit v1.2.3


From 54a26c8e353069abacefe5232f8270bec6b3cc60 Mon Sep 17 00:00:00 2001
From: Thomas Lenz <tlenz@iaik.tugraz.at>
Date: Mon, 21 Mar 2016 15:49:24 +0100
Subject: update libs

---
 pom.xml | 46 ++++++++++++++++++++++++++--------------------
 1 file changed, 26 insertions(+), 20 deletions(-)

(limited to 'pom.xml')

diff --git a/pom.xml b/pom.xml
index 4117c52b4..f9657240e 100644
--- a/pom.xml
+++ b/pom.xml
@@ -23,7 +23,8 @@
 		
 			<!-- Project Version -->			
 			<moa-id-version>3.2.0-OPB-Snapshot</moa-id-version>
-			<moa-id-version-final>3.2.0-RC1</moa-id-version-final>
+			
+			<moa-id-version-final>3.1.0-RC2</moa-id-version-final>			
 			<moa-id-version-edu>3.2.0-OPB-Snapshot</moa-id-version-edu>			
 			
 			<moa-id-proxy-version>2.0.1-Snapshot</moa-id-proxy-version>
@@ -32,31 +33,35 @@
 			<demo-oa-version>2.0.5</demo-oa-version>
 			
 			<moa-id-module-elga_mandate_client>1.0.0-Snapshot</moa-id-module-elga_mandate_client>
-		
-		
-			<moa-spss-version>2.0.5-RC1</moa-spss-version>
-		
+				
+					
 			<!-- Library Versions -->
-			<org.springframework.version>4.2.4.RELEASE</org.springframework.version>
-			<surefire.version>2.18.1</surefire.version>		
-			<opensaml.version>2.6.5</opensaml.version>
-			<xmltooling.version>1.4.5</xmltooling.version>
-			<cxf.version>3.1.4</cxf.version>
+			<moa-spss-version>2.0.5</moa-spss-version>
+			
+			<org.springframework.version>4.2.5.RELEASE</org.springframework.version>
+			<surefire.version>2.19.1</surefire.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>
+			
+			<hibernate.version>5.1.0.Final</hibernate.version>  <!-- update to v5 -->
+			<cxf.version>3.1.5</cxf.version>			
 			<struts.version>2.3.24.1</struts.version>
+			
 			<egovutils.version>2.0.0</egovutils.version>
-			<slf4j.version>1.7.19</slf4j.version>
-			<hibernate.version>4.3.11.Final</hibernate.version>
+			
+			<slf4j.version>1.7.19</slf4j.version>						
 			<mysql-connector.java>5.1.38</mysql-connector.java>			
-			<junit.version>4.11</junit.version>
+			<junit.version>4.11</junit.version>			
 			<org.apache.commons.io.version>2.4</org.apache.commons.io.version>
 			<org.apache.commons.lang3.version>3.4</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.7</jodatime.version>
 			
-			<jackson-version>2.7.0</jackson-version>
+			<jackson-version>2.7.3</jackson-version>
 	    <apache-cli-version>1.3.1</apache-cli-version>
-	    <spring-orm-version>3.1.1.RELEASE</spring-orm-version>
+	    <spring-orm-version>${org.springframework.version}</spring-orm-version>
 	   
     </properties>
 
@@ -337,7 +342,7 @@
 				</dependency>
 			
 			
-            <dependency>
+<!--             <dependency>
                 <groupId>axis</groupId>
                 <artifactId>axis</artifactId>
                 <version>1.0_IAIK_1.2</version>                
@@ -360,7 +365,8 @@
                <artifactId>axis-wsdl4j</artifactId>
                <version>1.5.1</version>
                <scope>compile</scope>
-            </dependency>
+            </dependency> -->
+            
             <dependency>
                 <groupId>jaxen</groupId>
                 <artifactId>jaxen</artifactId>
@@ -411,7 +417,7 @@
             <dependency>
 							 <groupId>org.apache.httpcomponents</groupId>
 							 <artifactId>httpclient</artifactId>
-							 <version>4.5.1</version>
+							 <version>4.5.2</version>
 						</dependency>            
             <dependency>
                 <groupId>dav4j</groupId>
@@ -432,11 +438,11 @@
             </dependency> -->
 
 
-						<dependency>
+<!-- 						<dependency>
 							<groupId>org.bouncycastle</groupId>
 							<artifactId>bcprov-jdk16</artifactId>
 							<version>1.46</version>
-						</dependency>
+						</dependency> -->
 
       			<dependency>
 							<groupId>MOA.id.server</groupId>
-- 
cgit v1.2.3


From f5970e6aa4f621e870db8a9337fb00598cd85703 Mon Sep 17 00:00:00 2001
From: Thomas Lenz <tlenz@iaik.tugraz.at>
Date: Tue, 22 Mar 2016 08:49:49 +0100
Subject: update third party libs

---
 pom.xml | 18 +++++++++++++-----
 1 file changed, 13 insertions(+), 5 deletions(-)

(limited to 'pom.xml')

diff --git a/pom.xml b/pom.xml
index f9657240e..41af492da 100644
--- a/pom.xml
+++ b/pom.xml
@@ -43,6 +43,7 @@
 			
 			<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.0.6</xmlsec.version>
 			
 			<hibernate.version>5.1.0.Final</hibernate.version>  <!-- update to v5 -->
 			<cxf.version>3.1.5</cxf.version>			
@@ -52,7 +53,7 @@
 			
 			<slf4j.version>1.7.19</slf4j.version>						
 			<mysql-connector.java>5.1.38</mysql-connector.java>			
-			<junit.version>4.11</junit.version>			
+			<junit.version>3.8.2</junit.version>			
 			<org.apache.commons.io.version>2.4</org.apache.commons.io.version>
 			<org.apache.commons.lang3.version>3.4</org.apache.commons.lang3.version>
 			<org.apache.commons.collections4.version>4.1</org.apache.commons.collections4.version>
@@ -285,6 +286,13 @@
 				<artifactId>xmltooling</artifactId>
 				<version>${xmltooling.version}</version>
 			</dependency>
+			<dependency>
+				<groupId>org.apache.santuario</groupId>
+				<artifactId>xmlsec</artifactId>
+				<version>${xmlsec.version}</version>
+			</dependency>
+
+
 
     	<dependency>
         	<groupId>org.apache.cxf</groupId>
@@ -554,7 +562,7 @@
             <dependency>
                 <groupId>junit</groupId>
                 <artifactId>junit</artifactId>
-                <version>3.8.2</version>
+                <version>${junit.version}</version>
                 <scope>test</scope>
             </dependency>
             <dependency>
@@ -566,9 +574,9 @@
             
             <dependency>
             	<groupId>javax.servlet</groupId>
-				<artifactId>servlet-api</artifactId>
-				<version>2.4</version> 
-				<scope>provide</scope>                
+							<artifactId>javax.servlet-api</artifactId>
+							<version>3.0.1</version> 
+						<scope>provide</scope>                
             </dependency>
              <dependency>
                 <groupId>javax.activation</groupId>
-- 
cgit v1.2.3


From e5e4f2b8cc2652e47d31ace6ee35e7aeab7d814a Mon Sep 17 00:00:00 2001
From: Thomas Lenz <tlenz@iaik.tugraz.at>
Date: Thu, 7 Apr 2016 10:45:13 +0200
Subject: small default-config and handbook updates for final version 3.1.0

---
 pom.xml | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

(limited to 'pom.xml')

diff --git a/pom.xml b/pom.xml
index 41af492da..afb98bc97 100644
--- a/pom.xml
+++ b/pom.xml
@@ -22,17 +22,17 @@
 		-->
 		
 			<!-- Project Version -->			
-			<moa-id-version>3.2.0-OPB-Snapshot</moa-id-version>
+			<moa-id-version>3.1.0</moa-id-version>
 			
-			<moa-id-version-final>3.1.0-RC2</moa-id-version-final>			
+			<moa-id-version-final>3.1.0</moa-id-version-final>			
 			<moa-id-version-edu>3.2.0-OPB-Snapshot</moa-id-version-edu>			
 			
 			<moa-id-proxy-version>2.0.1-Snapshot</moa-id-proxy-version>
 			
-			<configtool-version>2.2.0-OPB-Snapshot</configtool-version>
+			<configtool-version>2.2.0-final</configtool-version>
 			<demo-oa-version>2.0.5</demo-oa-version>
 			
-			<moa-id-module-elga_mandate_client>1.0.0-Snapshot</moa-id-module-elga_mandate_client>
+			<moa-id-module-elga_mandate_client>1.0-RC1</moa-id-module-elga_mandate_client>
 				
 					
 			<!-- Library Versions -->
@@ -46,8 +46,8 @@
 			<xmlsec.version>2.0.6</xmlsec.version>
 			
 			<hibernate.version>5.1.0.Final</hibernate.version>  <!-- update to v5 -->
-			<cxf.version>3.1.5</cxf.version>			
-			<struts.version>2.3.24.1</struts.version>
+			<cxf.version>3.1.6</cxf.version>			
+			<struts.version>2.3.28</struts.version>
 			
 			<egovutils.version>2.0.0</egovutils.version>
 			
@@ -468,6 +468,7 @@
 							<groupId>MOA.id</groupId>
 							<artifactId>moa-spss-container</artifactId>
   						<version>${moa-id-version}</version>
+  						<type>pom</type>
 						</dependency>
 						
             <dependency>
-- 
cgit v1.2.3