This is an automated email from the ASF dual-hosted git repository. ocket8888 pushed a commit to branch 5.1.x in repository https://gitbox.apache.org/repos/asf/trafficcontrol.git
commit 238f1a387d2e2d17b14a23f6d3dd6ef0aa1ed4ba Author: Zach Hoffman <[email protected]> AuthorDate: Wed Jan 12 09:40:47 2022 -0800 TR: Update jackson-databind and jackson-annotations to 2.13.1 (#6506) * Set jackson-databind and jackson-annotations versions from ${jackson-core.version} * Update jackson-databind and jackson-annotations to 2.13.1 (cherry picked from commit 2094836a5f92f04d513e272914e41e8c6a3ff25e) --- CHANGELOG.md | 1 + traffic_router/core/pom.xml | 4 ++-- traffic_router/pom.xml | 1 + traffic_router/shared/pom.xml | 4 ++-- 4 files changed, 6 insertions(+), 4 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 00a04eb..8e92129 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -5,6 +5,7 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/). ## [5.1.6] - 2022-01-12 - [#6446](https://github.com/apache/trafficcontrol/issues/6446) - Revert Traffic Router rollover file pattern to the one previously used in `log4j.properties` with Log4j 1.2 +- [#6506](https://github.com/apache/trafficcontrol/pull/6506) - Updated `jackson-databind` and `jackson-annotations` Traffic Router dependencies to version 2.13.1 ## [5.1.5] - 2021-12-20 - Updated `log4j` module in Traffic Router from version 1.2.17 to 2.17.0 diff --git a/traffic_router/core/pom.xml b/traffic_router/core/pom.xml index 535a863..037a744 100644 --- a/traffic_router/core/pom.xml +++ b/traffic_router/core/pom.xml @@ -319,12 +319,12 @@ <dependency> <groupId>com.fasterxml.jackson.core</groupId> <artifactId>jackson-databind</artifactId> - <version>2.11.3</version> + <version>${jackson-core.version}</version> </dependency> <dependency> <groupId>com.fasterxml.jackson.core</groupId> <artifactId>jackson-annotations</artifactId> - <version>2.11.3</version> + <version>${jackson-core.version}</version> </dependency> <dependency> <groupId>com.maxmind.geoip2</groupId> diff --git a/traffic_router/pom.xml b/traffic_router/pom.xml index 7b49227..109ba0b 100644 --- a/traffic_router/pom.xml +++ b/traffic_router/pom.xml @@ -34,6 +34,7 @@ <deploy.dir>/opt/traffic_router</deploy.dir> <spring.version>5.2.9.RELEASE</spring.version> <log4j.version>2.17.1</log4j.version> + <jackson-core.version>2.13.1</jackson-core.version> <junit.version>4.12</junit.version> <hamcrest.version>1.3</hamcrest.version> <geoip2.version>2.1.0</geoip2.version> diff --git a/traffic_router/shared/pom.xml b/traffic_router/shared/pom.xml index 11262ed..3467ff7 100644 --- a/traffic_router/shared/pom.xml +++ b/traffic_router/shared/pom.xml @@ -66,12 +66,12 @@ under the License. <dependency> <groupId>com.fasterxml.jackson.core</groupId> <artifactId>jackson-annotations</artifactId> - <version>2.4.0</version> + <version>${jackson-core.version}</version> </dependency> <dependency> <groupId>com.fasterxml.jackson.core</groupId> <artifactId>jackson-databind</artifactId> - <version>2.4.3</version> + <version>${jackson-core.version}</version> </dependency> <dependency> <groupId>org.hamcrest</groupId>
