From fd2f2cdaec428a0546ee58582df83209fff02b7a Mon Sep 17 00:00:00 2001
From: srosse <none@none>
Date: Wed, 14 Feb 2018 21:41:55 +0100
Subject: [PATCH] OO-3295: update spring framework to version 5.0.3 and slf4j
to version 1.7.25
---
pom.xml | 38 ++++++++++++--------------
src/main/webapp-tomcat/WEB-INF/web.xml | 9 ------
2 files changed, 18 insertions(+), 29 deletions(-)
diff --git a/pom.xml b/pom.xml
index 3caae5cbb9f..8b4c47e0dca 100644
--- a/pom.xml
+++ b/pom.xml
@@ -62,7 +62,7 @@
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<targetJdk>1.8</targetJdk>
- <org.springframework.version>4.3.14.RELEASE</org.springframework.version>
+ <org.springframework.version>5.0.3.RELEASE</org.springframework.version>
<org.hibernate.version>5.2.13.Final</org.hibernate.version>
<com.sun.jersey.version>1.19.4</com.sun.jersey.version>
<jackson.version>1.9.2</jackson.version>
@@ -2075,23 +2075,23 @@
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
- <version>1.5.11</version>
+ <version>1.7.25</version>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-log4j12</artifactId>
- <version>1.5.11</version>
+ <version>1.7.25</version>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>jul-to-slf4j</artifactId>
- <version>1.5.8</version>
+ <version>1.7.25</version>
</dependency>
<!-- Replace commons-logging -->
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>jcl-over-slf4j</artifactId>
- <version>1.5.8</version>
+ <version>1.7.25</version>
</dependency>
<dependency>
<groupId>log4j</groupId>
@@ -2270,6 +2270,12 @@
<groupId>org.quartz-scheduler</groupId>
<artifactId>quartz</artifactId>
<version>2.2.3</version>
+ <exclusions>
+ <exclusion>
+ <groupId>c3p0</groupId>
+ <artifactId>c3p0</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>com.thoughtworks.xstream</groupId>
@@ -2350,9 +2356,9 @@
<artifactId>spring-core</artifactId>
<version>${org.springframework.version}</version>
<exclusions>
- <exclusion>
- <groupId>commons-logging</groupId>
- <artifactId>commons-logging</artifactId>
+ <exclusion><!-- use jlc-over-slfj because we still use log4j version 1.2 -->
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-jlc</artifactId>
</exclusion>
</exclusions>
</dependency>
@@ -2365,23 +2371,11 @@
<groupId>org.springframework</groupId>
<artifactId>spring-beans</artifactId>
<version>${org.springframework.version}</version>
- <exclusions>
- <exclusion>
- <groupId>commons-logging</groupId>
- <artifactId>commons-logging</artifactId>
- </exclusion>
- </exclusions>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-context</artifactId>
<version>${org.springframework.version}</version>
- <exclusions>
- <exclusion>
- <groupId>commons-logging</groupId>
- <artifactId>commons-logging</artifactId>
- </exclusion>
- </exclusions>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
@@ -2570,6 +2564,10 @@
<groupId>org.mortbay.jetty</groupId>
<artifactId>servlet-api-2.5</artifactId>
</exclusion>
+ <exclusion>
+ <groupId>commons-logging</groupId>
+ <artifactId>commons-logging</artifactId>
+ </exclusion>
</exclusions>
</dependency>
<!-- End test dependencies -->
diff --git a/src/main/webapp-tomcat/WEB-INF/web.xml b/src/main/webapp-tomcat/WEB-INF/web.xml
index 760b48ba8e5..56de915a138 100644
--- a/src/main/webapp-tomcat/WEB-INF/web.xml
+++ b/src/main/webapp-tomcat/WEB-INF/web.xml
@@ -98,15 +98,6 @@
</listener-class>
</listener>
-
-
- <!-- this only works in an expanded war file: Comment on spring website:
- If you want to keep your WAR unexpanded or don't need application-specific log files within the WAR directory,
- don't use log4j setup within the application (thus, don't use Log4jConfigListener or Log4jConfigServlet).
- Instead, use a global, VM-wide log4j setup (for example, in JBoss) or JDK 1.4's java.util.logging (which is global too). -->
- <listener>
- <listener-class>org.springframework.web.util.Log4jConfigListener</listener-class>
- </listener>
<listener>
<listener-class>org.olat.restapi.security.RestApiSessionListener</listener-class>
</listener>
--
GitLab