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


From dbb7e7d21f318f5969521a1e3986101218b2b766 Mon Sep 17 00:00:00 2001
From: Thomas Lenz <tlenz@iaik.tugraz.at>
Date: Mon, 9 May 2016 09:45:59 +0200
Subject: update Struts to 2.3.28.1
 (https://web.nvd.nist.gov/view/vuln/detail?vulnId=CVE-2016-3081) switch
 MOA-ID Version to 3.1.1

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

(limited to 'pom.xml')

diff --git a/pom.xml b/pom.xml
index afb98bc97..8224f9a33 100644
--- a/pom.xml
+++ b/pom.xml
@@ -22,23 +22,23 @@
 		-->
 		
 			<!-- Project Version -->			
-			<moa-id-version>3.1.0</moa-id-version>
+			<moa-id-version>3.1.1</moa-id-version>
 			
-			<moa-id-version-final>3.1.0</moa-id-version-final>			
+			<moa-id-version-final>3.1.1</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-final</configtool-version>
+			<configtool-version>2.2.1-final</configtool-version>
 			<demo-oa-version>2.0.5</demo-oa-version>
 			
-			<moa-id-module-elga_mandate_client>1.0-RC1</moa-id-module-elga_mandate_client>
+			<moa-id-module-elga_mandate_client>1.0</moa-id-module-elga_mandate_client>
 				
 					
 			<!-- Library Versions -->
 			<moa-spss-version>2.0.5</moa-spss-version>
 			
-			<org.springframework.version>4.2.5.RELEASE</org.springframework.version>
+			<org.springframework.version>4.2.6.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)-->
@@ -47,11 +47,11 @@
 			
 			<hibernate.version>5.1.0.Final</hibernate.version>  <!-- update to v5 -->
 			<cxf.version>3.1.6</cxf.version>			
-			<struts.version>2.3.28</struts.version>
+			<struts.version>2.3.28.1</struts.version>
 			
 			<egovutils.version>2.0.0</egovutils.version>
 			
-			<slf4j.version>1.7.19</slf4j.version>						
+			<slf4j.version>1.7.21</slf4j.version>						
 			<mysql-connector.java>5.1.38</mysql-connector.java>			
 			<junit.version>3.8.2</junit.version>			
 			<org.apache.commons.io.version>2.4</org.apache.commons.io.version>
@@ -60,7 +60,7 @@
 			<org.apache.commons.collections3.version>3.2.2</org.apache.commons.collections3.version>
 			<jodatime.version>2.7</jodatime.version>
 			
-			<jackson-version>2.7.3</jackson-version>
+			<jackson-version>2.7.4</jackson-version>
 	    <apache-cli-version>1.3.1</apache-cli-version>
 	    <spring-orm-version>${org.springframework.version}</spring-orm-version>
 	   
-- 
cgit v1.2.3