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
The following commit(s) were added to refs/heads/5.1.x by this push:
new e226aa1 Update Tomcat to 8.5.63 (#5535)
e226aa1 is described below
commit e226aa1e32c8be5f3a5769dbce1195f5724d7223
Author: Zach Hoffman <[email protected]>
AuthorDate: Fri Feb 19 09:35:31 2021 -0700
Update Tomcat to 8.5.63 (#5535)
* Update Tomcat to 8.5.63
* Update Apache Tomcat Native to 1.2.23
(cherry picked from commit 594d2545066a3c43d173a4e6d91ca01a18b456d5)
---
CHANGELOG.md | 10 ++++++++++
docs/source/development/traffic_router.rst | 2 +-
traffic_router/build/build_rpm.sh | 2 +-
traffic_router/build/pom.xml | 2 +-
traffic_router/connector/pom.xml | 4 ++--
traffic_router/core/pom.xml | 6 +++---
6 files changed, 18 insertions(+), 8 deletions(-)
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 61725aa..15c5a02 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -52,6 +52,16 @@ The format is based on [Keep a
Changelog](http://keepachangelog.com/en/1.0.0/).
### Changed
- Refactored the Traffic Ops Go client internals so that all public methods
have a consistent behavior/implementation
- Pinned external actions used by Documentation Build and TR Unit Tests
workflows to commit SHA-1 and the Docker image used by the Weasel workflow to a
SHA-256 digest
+<<<<<<< HEAD
+=======
+- Updated Flot libraries to supported versions
+- [apache/trafficcontrol](https://github.com/apache/trafficcontrol) is now a
Go module
+- Updated Apache Tomcat from 8.5.57 to 8.5.63
+- Updated Apache Tomcat Native from 1.2.16 to 1.2.23
+
+### Removed
+- The Perl implementation of Traffic Ops has been stripped out, along with the
Go implementation's "fall-back to Perl" behavior.
+>>>>>>> 594d25450 (Update Tomcat to 8.5.63 (#5535))
## [5.0.0] - 2020-10-20
### Added
diff --git a/docs/source/development/traffic_router.rst
b/docs/source/development/traffic_router.rst
index c8fdfeb..09aa0e9 100644
--- a/docs/source/development/traffic_router.rst
+++ b/docs/source/development/traffic_router.rst
@@ -39,7 +39,7 @@ To work on Traffic Router you need a \*nix (MacOS and Linux
are most commonly us
* JDK >= 8.0 (OpenJDK suggested, but not required)
* OpenSSL >= 1.0.2
* :abbr:`APR (Apache Portable Runtime)` >= 1.4.8-3
-* Tomcat Native >= 1.2.16
+* Tomcat Native >= 1.2.23
* Not Tomcat - You do not need a Tomcat installation for development. An
embedded version is launched for development testing instead.
.. _dev-tr-mac-jdk:
diff --git a/traffic_router/build/build_rpm.sh
b/traffic_router/build/build_rpm.sh
index 6eaf498..daec972 100755
--- a/traffic_router/build/build_rpm.sh
+++ b/traffic_router/build/build_rpm.sh
@@ -76,7 +76,7 @@ adaptEnvironment() {
RPM="${PACKAGE}-${TC_VERSION}-${BUILD_NUMBER}.x86_64.rpm"
RPM_TARGET_OS="${RPM_TARGET_OS:-linux}"
TOMCAT_VERSION=8.5
- TOMCAT_RELEASE=57
+ TOMCAT_RELEASE=63
export PACKAGE TC_VERSION BUILD_NUMBER BUILD_LOCK WORKSPACE RPMBUILD
DIST RPM RPM_TARGET_OS TOMCAT_VERSION TOMCAT_RELEASE
echo "=================================================="
diff --git a/traffic_router/build/pom.xml b/traffic_router/build/pom.xml
index c9a3fb9..10d525e 100644
--- a/traffic_router/build/pom.xml
+++ b/traffic_router/build/pom.xml
@@ -240,7 +240,7 @@
<require>java
>= 1.8</require>
<require>tomcat
= ${env.TOMCAT_VERSION}.${env.TOMCAT_RELEASE}-${env.BUILD_LOCK}</require>
<require>apr
>= 1.4.8</require>
-
<require>tomcat-native >= 1.2.16</require>
+
<require>tomcat-native >= 1.2.23</require>
</requires>
<obsoletes>
<obsolete>traffic_router < 3.0.0</obsolete>
diff --git a/traffic_router/connector/pom.xml b/traffic_router/connector/pom.xml
index ea59d59..3e9b218 100644
--- a/traffic_router/connector/pom.xml
+++ b/traffic_router/connector/pom.xml
@@ -85,13 +85,13 @@
<dependency>
<groupId>org.apache.tomcat</groupId>
<artifactId>tomcat-coyote</artifactId>
- <version>8.5.57</version>
+ <version>8.5.63</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.tomcat</groupId>
<artifactId>tomcat-catalina</artifactId>
- <version>8.5.57</version>
+ <version>8.5.63</version>
<scope>provided</scope>
</dependency>
<dependency>
diff --git a/traffic_router/core/pom.xml b/traffic_router/core/pom.xml
index d4e7e77..20fe2b1 100644
--- a/traffic_router/core/pom.xml
+++ b/traffic_router/core/pom.xml
@@ -346,19 +346,19 @@
<dependency>
<groupId>org.apache.tomcat</groupId>
<artifactId>tomcat-catalina</artifactId>
- <version>8.5.57</version>
+ <version>8.5.63</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.tomcat</groupId>
<artifactId>tomcat-coyote</artifactId>
- <version>8.5.57</version>
+ <version>8.5.63</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.tomcat</groupId>
<artifactId>tomcat-jni</artifactId>
- <version>8.5.57</version>
+ <version>8.5.63</version>
<scope>provided</scope>
</dependency>
<dependency>
