This is an automated email from the ASF dual-hosted git repository.
smalenfant pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/trafficcontrol.git
The following commit(s) were added to refs/heads/master by this push:
new dd2f7f4 Update Spring to 5.2.9 (#5096)
dd2f7f4 is described below
commit dd2f7f4e02876af5891c3def11d3af84679ab216
Author: Joshua Zenn <[email protected]>
AuthorDate: Tue Oct 6 10:00:28 2020 -0400
Update Spring to 5.2.9 (#5096)
* Update to latest version
Updated all references to Tomcat packages to 8.5.57 (newest 8.5.x as of
8/24/2020).
* Update Spring to latest release version
* Fixed broken Spring 5 dependencies
Fixed XML issues with manual dependency specification and other changes as
requested in PR #5096.
---
traffic_router/core/pom.xml | 9 +++++++--
.../core/src/main/webapp/WEB-INF/applicationContext.xml | 4 ++--
traffic_router/pom.xml | 2 +-
3 files changed, 10 insertions(+), 5 deletions(-)
diff --git a/traffic_router/core/pom.xml b/traffic_router/core/pom.xml
index bda1813..3b07f63 100644
--- a/traffic_router/core/pom.xml
+++ b/traffic_router/core/pom.xml
@@ -319,7 +319,12 @@
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-databind</artifactId>
- <version>2.4.3</version>
+ <version>2.11.3</version>
+ </dependency>
+ <dependency>
+ <groupId>com.fasterxml.jackson.core</groupId>
+ <artifactId>jackson-annotations</artifactId>
+ <version>2.11.3</version>
</dependency>
<dependency>
<groupId>com.maxmind.geoip2</groupId>
@@ -365,7 +370,7 @@
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-websocket</artifactId>
- <version>4.0.0.RELEASE</version>
+ <version>${spring.version}</version>
</dependency>
<dependency>
diff --git a/traffic_router/core/src/main/webapp/WEB-INF/applicationContext.xml
b/traffic_router/core/src/main/webapp/WEB-INF/applicationContext.xml
index 9de67d5..544cf55 100644
--- a/traffic_router/core/src/main/webapp/WEB-INF/applicationContext.xml
+++ b/traffic_router/core/src/main/webapp/WEB-INF/applicationContext.xml
@@ -344,8 +344,8 @@
<property name="protocolService" ref="ProtocolExecutorService"
/>
<property name="protocols">
<list>
- <ref local="TCP" />
- <ref local="UDP" />
+ <ref bean="TCP" />
+ <ref bean="UDP" />
</list>
</property>
</bean>
diff --git a/traffic_router/pom.xml b/traffic_router/pom.xml
index 86a9b76..5adb31b 100644
--- a/traffic_router/pom.xml
+++ b/traffic_router/pom.xml
@@ -32,7 +32,7 @@
<properties>
<deploy.dir>/opt/traffic_router</deploy.dir>
- <spring.version>4.2.5.RELEASE</spring.version>
+ <spring.version>5.2.9.RELEASE</spring.version>
<log4j.version>1.2.17</log4j.version>
<junit.version>4.12</junit.version>
<hamcrest.version>1.3</hamcrest.version>
