From 28ce6c1558cfeeb76a45b305f2540880d6dcfd90 Mon Sep 17 00:00:00 2001 From: Zach Hoffman Date: Tue, 11 Jan 2022 03:10:11 -0700 Subject: [PATCH 1/2] Set jackson-databind and jackson-annotations versions from ${jackson-core.version} --- traffic_router/core/pom.xml | 4 ++-- traffic_router/pom.xml | 1 + traffic_router/shared/pom.xml | 4 ++-- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/traffic_router/core/pom.xml b/traffic_router/core/pom.xml index 65a89a32da..f97f06dbb8 100644 --- a/traffic_router/core/pom.xml +++ b/traffic_router/core/pom.xml @@ -319,12 +319,12 @@ com.fasterxml.jackson.core jackson-databind - 2.11.3 + ${jackson-core.version} com.fasterxml.jackson.core jackson-annotations - 2.11.3 + ${jackson-core.version} com.maxmind.geoip2 diff --git a/traffic_router/pom.xml b/traffic_router/pom.xml index a820dc96b5..f87551c9d0 100644 --- a/traffic_router/pom.xml +++ b/traffic_router/pom.xml @@ -34,6 +34,7 @@ /opt/traffic_router 5.2.9.RELEASE 2.17.1 + 2.11.3 4.12 1.3 2.1.0 diff --git a/traffic_router/shared/pom.xml b/traffic_router/shared/pom.xml index c2794947d8..23a081b49c 100644 --- a/traffic_router/shared/pom.xml +++ b/traffic_router/shared/pom.xml @@ -66,12 +66,12 @@ under the License. com.fasterxml.jackson.core jackson-annotations - 2.4.0 + ${jackson-core.version} com.fasterxml.jackson.core jackson-databind - 2.4.3 + ${jackson-core.version} org.hamcrest From e9f2d2fe4b48e9a787b8a65535bd6317e395f263 Mon Sep 17 00:00:00 2001 From: Zach Hoffman Date: Tue, 11 Jan 2022 03:10:39 -0700 Subject: [PATCH 2/2] Update jackson-databind and jackson-annotations to 2.13.1 --- CHANGELOG.md | 1 + traffic_router/pom.xml | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index c2d67fa1f2..17b33d3fd2 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -48,6 +48,7 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/). - [#6376](https://github.com/apache/trafficcontrol/issues/6376) Updated TO/TM so that TM doesn't overwrite monitoring snapshot data with CR config snapshot data. - Updated `t3c-apply` to reduce mutable state in `TrafficOpsReq` struct. - Updated Golang dependencies +- [#6506](https://github.com/apache/trafficcontrol/pull/6506) - Updated `jackson-databind` and `jackson-annotations` Traffic Router dependencies to version 2.13.1 ### Deprecated - Deprecated the endpoints and docs associated with `api_capability`. diff --git a/traffic_router/pom.xml b/traffic_router/pom.xml index f87551c9d0..2204004387 100644 --- a/traffic_router/pom.xml +++ b/traffic_router/pom.xml @@ -34,7 +34,7 @@ /opt/traffic_router 5.2.9.RELEASE 2.17.1 - 2.11.3 + 2.13.1 4.12 1.3 2.1.0