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

---
 id/ConfigWebTool/pom.xml                      |  8 ++++----
 id/moa-spss-container/pom.xml                 | 10 ++++++++--
 id/server/auth-edu/pom.xml                    |  6 ++++++
 id/server/moa-id-commons/pom.xml              |  8 ++++++--
 id/server/modules/moa-id-module-eIDAS/pom.xml | 12 ++++++++++++
 pom.xml                                       | 14 +++++++++++---
 6 files changed, 47 insertions(+), 11 deletions(-)

diff --git a/id/ConfigWebTool/pom.xml b/id/ConfigWebTool/pom.xml
index aed716139..ecb956bb8 100644
--- a/id/ConfigWebTool/pom.xml
+++ b/id/ConfigWebTool/pom.xml
@@ -61,8 +61,8 @@
             <scope>provided</scope>
         </dependency>
         <dependency>
-            <groupId>log4j</groupId>
-            <artifactId>log4j</artifactId>
+            <groupId>org.apache.logging.log4j</groupId>
+						<artifactId>log4j-core</artifactId>
         </dependency>
 
         <dependency>
@@ -205,8 +205,8 @@
         </dependency>
 
         <dependency>
-            <groupId>log4j</groupId>
-            <artifactId>log4j</artifactId>
+           <groupId>org.apache.logging.log4j</groupId>
+							<artifactId>log4j-core</artifactId>
         </dependency>
         <dependency>
             <groupId>commons-lang</groupId>
diff --git a/id/moa-spss-container/pom.xml b/id/moa-spss-container/pom.xml
index c0fcca040..1f7cb673f 100644
--- a/id/moa-spss-container/pom.xml
+++ b/id/moa-spss-container/pom.xml
@@ -105,10 +105,16 @@
 			<groupId>junit</groupId>
 			<artifactId>junit</artifactId>
 		</dependency>
-		<dependency>
+		
+<!-- 		<dependency>
 			<groupId>log4j</groupId>
 			<artifactId>log4j</artifactId>
-		</dependency>
+		</dependency> -->
+<!-- 		   <dependency>
+					<groupId>org.apache.logging.log4j</groupId>
+					<artifactId>log4j-core</artifactId>
+				</dependency> -->
+		
 		<dependency>
 			<groupId>org.postgresql</groupId>
 			<artifactId>postgresql</artifactId>
diff --git a/id/server/auth-edu/pom.xml b/id/server/auth-edu/pom.xml
index 404b7c354..fc6b8fe23 100644
--- a/id/server/auth-edu/pom.xml
+++ b/id/server/auth-edu/pom.xml
@@ -154,6 +154,12 @@
 		<dependency>
 			<groupId>MOA.id.server.modules</groupId>
 			<artifactId>moa-id-module-eIDAS</artifactId>
+			<exclusions>
+				<exclusion>
+					<artifactId>log4j-over-slf4j</artifactId>
+					<groupId>org.slf4j</groupId>
+				</exclusion>
+			</exclusions>
 		</dependency>
 		
 		
diff --git a/id/server/moa-id-commons/pom.xml b/id/server/moa-id-commons/pom.xml
index 2fc72119e..d0cd08844 100644
--- a/id/server/moa-id-commons/pom.xml
+++ b/id/server/moa-id-commons/pom.xml
@@ -128,10 +128,14 @@
 						<groupId>org.slf4j</groupId>
 						<artifactId>slf4j-log4j12</artifactId>
 				</dependency>
-        <dependency>
+<!--         <dependency>
             <groupId>log4j</groupId>
             <artifactId>log4j</artifactId>
-        </dependency>
+        </dependency> -->
+<!--         <dependency>
+					<groupId>org.apache.logging.log4j</groupId>
+					<artifactId>log4j-core</artifactId>
+				</dependency> -->
     
     
         <dependency>
diff --git a/id/server/modules/moa-id-module-eIDAS/pom.xml b/id/server/modules/moa-id-module-eIDAS/pom.xml
index 9e95301bd..addf086d8 100644
--- a/id/server/modules/moa-id-module-eIDAS/pom.xml
+++ b/id/server/modules/moa-id-module-eIDAS/pom.xml
@@ -77,12 +77,24 @@
 			<groupId>eu.eidas</groupId>
   		<artifactId>eidas-configmodule</artifactId>
   		<version>${eidas-configmodule.version}</version>
+  		<exclusions>
+  			<exclusion>
+  				<artifactId>log4j-over-slf4j</artifactId>
+  				<groupId>org.slf4j</groupId>
+  			</exclusion>
+  		</exclusions>
 		</dependency>
 
 		<dependency>
 			<groupId>eu.eidas</groupId>
 			<artifactId>eidas-encryption</artifactId>
   		<version>${eidas-encryption.version}</version>
+  		<exclusions>
+  			<exclusion>
+  				<artifactId>log4j-over-slf4j</artifactId>
+  				<groupId>org.slf4j</groupId>
+  			</exclusion>
+  		</exclusions>
 		</dependency>
 
 		<!-- eidas SAML Engine -->
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