From c0358db3ac257a91364691654fe82f1b1a4f8bab Mon Sep 17 00:00:00 2001
From: Pamela Dragosh <pdragosh@research.att.com>
Date: Fri, 19 Apr 2019 10:27:49 -0400
Subject: [PATCH] Upgrade tomcat to 9.0.16

Removes security vulnerability.

Issue-ID: POLICY-1662
Change-Id: I6a90716af561d227265a83c820b1668a99ab1a30
Signed-off-by: Pamela Dragosh <pdragosh@research.att.com>
---
 packages/base/pom.xml                             | 4 ++--
 packages/docker/src/main/docker/docker-install.sh | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/packages/base/pom.xml b/packages/base/pom.xml
index f5b936b44..18dc891a1 100755
--- a/packages/base/pom.xml
+++ b/packages/base/pom.xml
@@ -117,14 +117,14 @@
 								<artifactItem>
 									<groupId>org.apache.tomcat</groupId>
 									<artifactId>tomcat</artifactId>
-									<version>8.5.34</version>
+									<version>9.0.16</version>
 									<type>tar.gz</type>
 									<!--
 									Please note that if you change this version, you must
 									update the docker-install.sh script to ensure the right
 									file name is installed. 
 									 -->
-									<destFileName>apache-tomcat-8.5.34.tar.gz</destFileName>
+									<destFileName>apache-tomcat-9.0.16.tar.gz</destFileName>
 								</artifactItem>
 							</artifactItems>
 						</configuration>
diff --git a/packages/docker/src/main/docker/docker-install.sh b/packages/docker/src/main/docker/docker-install.sh
index 36cc8aa92..fbd834dbe 100644
--- a/packages/docker/src/main/docker/docker-install.sh
+++ b/packages/docker/src/main/docker/docker-install.sh
@@ -628,7 +628,7 @@ DEBUG=n
 
 BASE_CONF=base.conf
 
-TOMCAT_PACKAGE_NAME=apache-tomcat-8.5.34
+TOMCAT_PACKAGE_NAME=apache-tomcat-9.0.16
 
 INSTALL_DIR="$(pwd)"
 
-- 
2.16.6