aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThomas Lenz <tlenz@iaik.tugraz.at>2014-03-11 11:19:41 +0100
committerThomas Lenz <tlenz@iaik.tugraz.at>2014-03-11 11:19:41 +0100
commit40fa3b460648997421f24aae509c747fd3e94a7f (patch)
tree86902612a63dc5e82367b0ca02d8d7018dac4294
parentcc30fc1467241bf3bc90a292ee88dcf07b542a49 (diff)
downloadmoa-id-spss-40fa3b460648997421f24aae509c747fd3e94a7f.tar.gz
moa-id-spss-40fa3b460648997421f24aae509c747fd3e94a7f.tar.bz2
moa-id-spss-40fa3b460648997421f24aae509c747fd3e94a7f.zip
solve errors in combination with Tomcat 8 and log4j and slf4log
-rw-r--r--id/ConfigWebTool/pom.xml14
-rw-r--r--id/server/moa-id-commons/pom.xml14
-rw-r--r--pom.xml4
3 files changed, 23 insertions, 9 deletions
diff --git a/id/ConfigWebTool/pom.xml b/id/ConfigWebTool/pom.xml
index 287b0b096..b5b753027 100644
--- a/id/ConfigWebTool/pom.xml
+++ b/id/ConfigWebTool/pom.xml
@@ -68,9 +68,17 @@
<groupId>com.sun</groupId>
<artifactId>*</artifactId>
</exclusion>
- </exclusions>
-
- </dependency>
+ <exclusion>
+ <groupId>org.slf4j</groupId>
+ <artifactId>*</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-simple</artifactId>
+ <version>1.7.5</version>
+ </dependency>
<dependency>
<groupId>org.opensaml</groupId>
diff --git a/id/server/moa-id-commons/pom.xml b/id/server/moa-id-commons/pom.xml
index a49f29bf3..7f1d9e45c 100644
--- a/id/server/moa-id-commons/pom.xml
+++ b/id/server/moa-id-commons/pom.xml
@@ -63,10 +63,16 @@
<version>0.5.6</version>
</dependency>
<dependency>
- <groupId>org.jvnet.hyperjaxb3</groupId>
- <artifactId>maven-hyperjaxb3-plugin</artifactId>
- <version>0.5.6</version>
-</dependency>
+ <groupId>org.jvnet.hyperjaxb3</groupId>
+ <artifactId>maven-hyperjaxb3-plugin</artifactId>
+ <version>0.5.6</version>
+ <exclusions>
+ <exclusion>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-log4j12</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
<dependency>
<groupId>mysql</groupId>
<artifactId>mysql-connector-java</artifactId>
diff --git a/pom.xml b/pom.xml
index c297242cd..a570a7117 100644
--- a/pom.xml
+++ b/pom.xml
@@ -145,7 +145,7 @@
<dependency>
<groupId>log4j</groupId>
<artifactId>log4j</artifactId>
- <version>1.2.14</version>
+ <version>1.2.17</version>
<scope>compile</scope>
</dependency>
<dependency>
@@ -229,7 +229,7 @@
<dependency>
<groupId>commons-logging</groupId>
<artifactId>commons-logging</artifactId>
- <version>1.0.4</version>
+ <version>1.1.3</version>
<scope>compile</scope>
</dependency>