From 278b9c49645426ae7debfc6f649f2f6550464df0 Mon Sep 17 00:00:00 2001
From: Thomas Lenz <tlenz@iaik.tugraz.at>
Date: Mon, 12 May 2014 09:59:15 +0200
Subject: solve problem with log4j and tomcat 8

---
 common/pom.xml                       | 13 ++++++---
 id/ConfigWebTool/pom.xml             |  6 +++--
 id/pom.xml                           |  5 ++--
 id/server/auth/pom.xml               |  6 +++--
 id/server/idserverlib/pom.xml        | 52 +++++++++++++++++++-----------------
 id/server/stork2-saml-engine/pom.xml |  8 +++---
 6 files changed, 51 insertions(+), 39 deletions(-)

diff --git a/common/pom.xml b/common/pom.xml
index 37c083ec7..c5bf69ffb 100644
--- a/common/pom.xml
+++ b/common/pom.xml
@@ -73,21 +73,26 @@
             <artifactId>slf4j-api</artifactId>
             <version>1.7.6</version>
         </dependency>
-        <dependency>
+<!--         <dependency>
             <groupId>org.slf4j</groupId>
             <artifactId>slf4j-simple</artifactId>
             <version>1.7.6</version>
-        </dependency>
+        </dependency> -->
         <dependency>
             <groupId>org.slf4j</groupId>
             <artifactId>jcl-over-slf4j</artifactId>
             <version>1.7.6</version>
         </dependency>
-        <dependency>
+<!--         <dependency>
             <groupId>org.slf4j</groupId>
             <artifactId>log4j-over-slf4j</artifactId>
             <version>1.7.6</version>
-        </dependency>
+        </dependency> -->
+        <dependency>
+					<groupId>org.slf4j</groupId>
+					<artifactId>slf4j-log4j12</artifactId>
+					<version>1.7.6</version>
+				</dependency>
         <dependency>
             <groupId>org.slf4j</groupId>
             <artifactId>jul-to-slf4j</artifactId>
diff --git a/id/ConfigWebTool/pom.xml b/id/ConfigWebTool/pom.xml
index aaadb1969..140555c7f 100644
--- a/id/ConfigWebTool/pom.xml
+++ b/id/ConfigWebTool/pom.xml
@@ -162,7 +162,9 @@
               		  </execution>
             		</executions>
         		</plugin>
-			
+					</plugins>
+				</pluginManagement>
+				<plugins>			
 					<plugin>
      			<groupId>org.apache.maven.plugins</groupId>
      			<artifactId>maven-war-plugin</artifactId>
@@ -176,7 +178,7 @@
     		 	</configuration>
 					</plugin>
 				</plugins>
-			</pluginManagement>
+			
 		</build>
 
 </project>
diff --git a/id/pom.xml b/id/pom.xml
index 18631a8d1..fc018ffa3 100644
--- a/id/pom.xml
+++ b/id/pom.xml
@@ -45,7 +45,9 @@
               		  </execution>
             		</executions>
         		</plugin>
-        
+        	</plugins>
+        </pluginManagement>
+        <plugins>
             <plugin>
                 <artifactId>maven-enforcer-plugin</artifactId>
                 <version>1.1.1</version>
@@ -79,7 +81,6 @@
                 </executions>
             </plugin>
         </plugins>
-        </pluginManagement>
     </build>
 
 </project>
diff --git a/id/server/auth/pom.xml b/id/server/auth/pom.xml
index 72da9ea47..5fe2aa739 100644
--- a/id/server/auth/pom.xml
+++ b/id/server/auth/pom.xml
@@ -48,7 +48,10 @@
               		  </execution>
             		</executions>
         		</plugin>
-			<plugin>
+        	</plugins>
+        </pluginManagement>
+      <plugins>
+				<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-war-plugin</artifactId>
 				<version>2.1.1</version>
@@ -79,7 +82,6 @@
 				</configuration>
 			</plugin>
 		</plugins>
-		</pluginManagement>
 	</build>
 	
 	<dependencies>
diff --git a/id/server/idserverlib/pom.xml b/id/server/idserverlib/pom.xml
index 5ce26814a..6a58f8bc8 100644
--- a/id/server/idserverlib/pom.xml
+++ b/id/server/idserverlib/pom.xml
@@ -132,21 +132,21 @@
             <artifactId>slf4j-api</artifactId>
             <version>1.7.6</version>
         </dependency>
-        <dependency>
+<!--         <dependency>
             <groupId>org.slf4j</groupId>
             <artifactId>slf4j-simple</artifactId>
             <version>1.7.6</version>
-        </dependency>
+        </dependency> -->
         <dependency>
             <groupId>org.slf4j</groupId>
             <artifactId>jcl-over-slf4j</artifactId>
             <version>1.7.6</version>
         </dependency>
-        <dependency>
+<!--         <dependency>
             <groupId>org.slf4j</groupId>
             <artifactId>log4j-over-slf4j</artifactId>
             <version>1.7.6</version>
-        </dependency>
+        </dependency> -->
         <dependency>
             <groupId>org.slf4j</groupId>
             <artifactId>jul-to-slf4j</artifactId>
@@ -273,7 +273,7 @@
 	<build>
 	<pluginManagement>
 		<plugins>
-		        		<plugin>
+		        <plugin>
             		<groupId>org.codehaus.mojo</groupId>
             		<artifactId>properties-maven-plugin</artifactId>
             		<version>1.0-alpha-2</version>
@@ -291,6 +291,9 @@
               		  </execution>
             		</executions>
         		</plugin>
+        	</plugins>
+        </pluginManagement>
+        <plugins>
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-compiler-plugin</artifactId>
@@ -299,25 +302,7 @@
 					<target>1.6</target>
 				</configuration>
 			</plugin>
-			<plugin>
-				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-jar-plugin</artifactId>
-				<configuration>
-				<skip>true</skip>
-				<skipTests>true</skipTests>
-					<archive>
-						<addMavenDescriptor>false</addMavenDescriptor>
-					</archive>
-				</configuration>
-				<executions>
-					<execution>
-						<goals>
-							<goal>test-jar</goal>
-						</goals>
-					</execution>
-				</executions>
-			</plugin>
-			<plugin>
+						<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-javadoc-plugin</artifactId>
 				<version>2.9.1</version>
@@ -358,8 +343,25 @@
 					</execution>
 				</executions>
 			</plugin>
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-jar-plugin</artifactId>
+				<configuration>
+				<skip>true</skip>
+				<skipTests>true</skipTests>
+					<archive>
+						<addMavenDescriptor>false</addMavenDescriptor>
+					</archive>
+				</configuration>
+				<executions>
+					<execution>
+						<goals>
+							<goal>test-jar</goal>
+						</goals>
+					</execution>
+				</executions>
+			</plugin>
 		</plugins>
-		</pluginManagement>
 	</build>
 
 </project>
diff --git a/id/server/stork2-saml-engine/pom.xml b/id/server/stork2-saml-engine/pom.xml
index 015697c5c..8e249bb1a 100644
--- a/id/server/stork2-saml-engine/pom.xml
+++ b/id/server/stork2-saml-engine/pom.xml
@@ -84,21 +84,21 @@
 			<artifactId>slf4j-api</artifactId>
 			<version>1.7.6</version>
 		</dependency>
-		<dependency>
+<!-- 		<dependency>
 			<groupId>org.slf4j</groupId>
 			<artifactId>slf4j-simple</artifactId>
 			<version>1.7.6</version>
-		</dependency>
+		</dependency> -->
 		<dependency>
 			<groupId>org.slf4j</groupId>
 			<artifactId>jcl-over-slf4j</artifactId>
 			<version>1.7.6</version>
 		</dependency>
-		<dependency>
+<!-- 		<dependency>
 			<groupId>org.slf4j</groupId>
 			<artifactId>log4j-over-slf4j</artifactId>
 			<version>1.7.6</version>
-		</dependency>
+		</dependency> -->
 		<dependency>
 			<groupId>org.slf4j</groupId>
 			<artifactId>jul-to-slf4j</artifactId>
-- 
cgit v1.2.3